conjure 0.1.5 → 0.1.6

data/History.md

@@ -1,3 +1,8 @@
+### Version 0.1.6
+2013-11-27
+
+* Support Docker 0.7
+
 ### Version 0.1.5
 2013-11-22
 

data/lib/conjure/service/docker_host.rb

@@ -218,7 +218,10 @@ module Conjure
       end
 
       def destroy_all_stopped
-        host.command "rm `#{host.docker_path} ps -a -q`"
+        all_ids = host.command("ps -a -q").split("\n").map(&:strip)
+        running_ids = host.command("ps -q").split("\n").map(&:strip)
+        stopped_ids = all_ids - running_ids
+        host.command "rm #{stopped_ids.join ' '}"
       end
 
       def destroy_all(options)

data/lib/conjure/service/rails_server.rb

@@ -15,6 +15,7 @@ module Conjure
             "curl -L https://get.rvm.io | bash -s stable",
             "rvm install #{ruby_version}",
             "bash -c 'source /usr/local/rvm/scripts/rvm; rvm use #{ruby_version}@global --default'",
+            "ln -s /usr/local/rvm/rubies/*/lib/ruby/gems/* /usr/local/rvm/gems/default",
             "apt-get install -y #{apt_packages_required_for_gems.join ' '}",
             "echo 'deb http://us.archive.ubuntu.com/ubuntu/ precise universe' >>/etc/apt/sources.list",
             "apt-get install -y python-software-properties software-properties-common",
@@ -24,7 +25,7 @@ module Conjure
 
           ],
           environment: {
-            PATH:"/usr/local/rvm/gems/ruby-1.9.3-p448@global/bin:/usr/local/rvm/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
+            PATH:"/usr/local/rvm/gems/default/bin:/usr/local/rvm/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
             RAILS_ENV: @rails_environment,
             GITHUB_TOKEN: ENV["GITHUB_TOKEN"],
             FRECKLE_SUBDOMAIN: "neomind",
@@ -38,7 +39,7 @@ module Conjure
           label: "rails_server",
           ports: [80],
           environment: {
-            PATH:"/usr/local/rvm/gems/ruby-1.9.3-p448@global/bin:/usr/local/rvm/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
+            PATH:"/usr/local/rvm/gems/default/bin:/usr/local/rvm/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
           },
         )
       end

data/lib/conjure/version.rb

@@ -1,3 +1,3 @@
 module Conjure
-  VERSION = "0.1.5" unless defined?(VERSION)
+  VERSION = "0.1.6" unless defined?(VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conjure
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-22 00:00:00.000000000 Z
+date: 2013-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog