From 76df7f031c9c1dee78b73ca3cb8ef75a47ac4960 Mon Sep 17 00:00:00 2001
From: Bruce Johnson <brjohnsn@gmail.com>
Date: Mon, 12 Feb 2018 17:56:51 -0500
Subject: [PATCH] Reorganize to please Nimble

Give credit to the REAL author
---
 .gitignore                             | 11 ++++++++---
 .travis.yml                            |  2 +-
 config.nims                            | 13 -------------
 nim.cfg                                |  1 +
 rx.nimble                              | 20 ++++++++++++++++++++
 {rx => src}/connectable.nim            |  0
 {rx => src}/core.nim                   |  0
 {rx => src}/ops.nim                    |  0
 rx.nim => src/rx.nim                   |  2 +-
 {rx => src}/schedulers.nim             |  0
 sharedqueue.nim => src/sharedqueue.nim |  0
 test.nim => tests/test.nim             |  0
 12 files changed, 31 insertions(+), 18 deletions(-)
 delete mode 100644 config.nims
 create mode 100644 nim.cfg
 create mode 100644 rx.nimble
 rename {rx => src}/connectable.nim (100%)
 rename {rx => src}/core.nim (100%)
 rename {rx => src}/ops.nim (100%)
 rename rx.nim => src/rx.nim (93%)
 rename {rx => src}/schedulers.nim (100%)
 rename sharedqueue.nim => src/sharedqueue.nim (100%)
 rename test.nim => tests/test.nim (100%)

diff --git a/.gitignore b/.gitignore
index 410f026..319536b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,8 @@
-nimcache
-rxx
-/test
+# ===== Ignore all files without extensions (targeting linux executables) =====
+*
+!*.*
+!*/
+# =============================================================================
+
+nimcache/
+bin/
diff --git a/.travis.yml b/.travis.yml
index 0b6b251..2a7ee51 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,4 +13,4 @@ before_install:
   - export PATH=$PWD/bin:$PATH
   - cd ..
 script:
-  - nim tests rx
\ No newline at end of file
+  - nimble test
\ No newline at end of file
diff --git a/config.nims b/config.nims
deleted file mode 100644
index 2f1bd46..0000000
--- a/config.nims
+++ /dev/null
@@ -1,13 +0,0 @@
-task run, "run rx":
-  --noNimblePath
-  switch("lib", "~/.choosenim/toolchains/nim-0.17.0/lib")
-  --threads: on
-  --run
-  switch("out", "rxx")
-  setCommand "c", "rx"
-
-task tests, "test rx":
-  --threads: on
-  --run
-  --path: "."
-  setCommand "c", "test"
\ No newline at end of file
diff --git a/nim.cfg b/nim.cfg
new file mode 100644
index 0000000..aed303e
--- /dev/null
+++ b/nim.cfg
@@ -0,0 +1 @@
+--threads:on
diff --git a/rx.nimble b/rx.nimble
new file mode 100644
index 0000000..2fc5dd0
--- /dev/null
+++ b/rx.nimble
@@ -0,0 +1,20 @@
+# Package
+
+version       = "0.1.0"
+author        = "Andrea Ferretti"
+description   = "Reactive Extensions for Nim"
+license       = "MIT"
+binDir        = "bin"
+srcDir        = "src"
+bin           = @["rx"]
+skipDirs      = @["tests"]
+
+# Dependencies
+
+requires "nim >= 0.17.0"
+
+task test, "test rx":
+  --threads: on
+  --run
+  --path: "src"
+  setCommand "c", "tests/test.nim"
\ No newline at end of file
diff --git a/rx/connectable.nim b/src/connectable.nim
similarity index 100%
rename from rx/connectable.nim
rename to src/connectable.nim
diff --git a/rx/core.nim b/src/core.nim
similarity index 100%
rename from rx/core.nim
rename to src/core.nim
diff --git a/rx/ops.nim b/src/ops.nim
similarity index 100%
rename from rx/ops.nim
rename to src/ops.nim
diff --git a/rx.nim b/src/rx.nim
similarity index 93%
rename from rx.nim
rename to src/rx.nim
index d579b18..360a0b0 100644
--- a/rx.nim
+++ b/src/rx.nim
@@ -1,5 +1,5 @@
 import threadpool, times
-import rx/schedulers, rx/core, rx/ops, rx/connectable
+import schedulers, core, ops, connectable
 
 export schedulers, core, ops, connectable
 
diff --git a/rx/schedulers.nim b/src/schedulers.nim
similarity index 100%
rename from rx/schedulers.nim
rename to src/schedulers.nim
diff --git a/sharedqueue.nim b/src/sharedqueue.nim
similarity index 100%
rename from sharedqueue.nim
rename to src/sharedqueue.nim
diff --git a/test.nim b/tests/test.nim
similarity index 100%
rename from test.nim
rename to tests/test.nim