moved files into own dir and added main leap_ca.rb

Also updated the couchdb.yml.example with more meaningful content

7 files changed, 13 insertions, 13 deletions

diff --git a/bin/leap_ca b/bin/leap_ca
index baefff2..f999238 100755
--- a/bin/leap_ca
+++ b/bin/leap_ca
@@ -1,19 +1,17 @@
 #!/usr/bin/ruby
+LEAP_CA_ROOT = File.expand_path('../..', __FILE__)
+$:.unshift File.expand_path('lib', LEAP_CA_ROOT)
 
 require 'rubygems'
 require 'daemons'
 require 'yajl/http_stream'
 
-require 'lib/cert'
-require 'lib/couch_stream'
-require 'lib/couch_changes'
-require 'lib/pool'
-
+require 'leap_ca'
 
 puts "Tracking #{Cert.database.root}"
 couch = CouchStream.new(Cert.database.root)
 changes = CouchChanges.new(couch)
-pool = LeapCA::Pool.new(File.expand_path("../config/pool.yml", __FILE__))
+pool = LeapCA::Pool.new(File.expand_path("config/pool.yml", LEAP_CA_ROOT))
 pool.fill
 Daemons.run_proc('leap_ca.rb') do
   changes.follow do |hash|
diff --git a/config/couchdb.yml.example b/config/couchdb.yml.example
index 1dd5fef..64058da 100644
--- a/config/couchdb.yml.example
+++ b/config/couchdb.yml.example
@@ -1,8 +1,6 @@
 development:
-  protocol: 'https'
-  host: sample.cloudant.com
-  port: 443
-  prefix: project
-  suffix: test
-  username: test
-  password: user
+  protocol: 'http'
+  host: 'localhost'
+  port: 5984
+  prefix: leap_web_demo
+  suffix: ''
diff --git a/lib/leap_ca.rb b/lib/leap_ca.rb
new file mode 100644
index 0000000..9720c81
--- /dev/null
+++ b/lib/leap_ca.rb
@@ -0,0 +1,4 @@
+require 'leap_ca/cert'
+require 'leap_ca/couch_stream'
+require 'leap_ca/couch_changes'
+require 'leap_ca/pool'
diff --git a/lib/cert.rb b/lib/leap_ca/cert.rb
index 80adfbb..80adfbb 100644
--- a/lib/cert.rb
+++ b/lib/leap_ca/cert.rb
diff --git a/lib/couch_changes.rb b/lib/leap_ca/couch_changes.rb
index 59209a4..59209a4 100644
--- a/lib/couch_changes.rb
+++ b/lib/leap_ca/couch_changes.rb
diff --git a/lib/couch_stream.rb b/lib/leap_ca/couch_stream.rb
index ed56db2..ed56db2 100644
--- a/lib/couch_stream.rb
+++ b/lib/leap_ca/couch_stream.rb
diff --git a/lib/pool.rb b/lib/leap_ca/pool.rb
index 76c1963..76c1963 100644
--- a/lib/pool.rb
+++ b/lib/leap_ca/pool.rb