dollhouse 0.2.1 → 0.2.2

data/lib/dollhouse/instance.rb

@@ -2,8 +2,8 @@ module Dollhouse
   class Instance < Struct.new(:instance_name, :deployment_name, :server_name, :ip)
     attr_accessor :user, :password
 
-    def bootstrap
-      cloud_adapter.execute(instance_name, %Q{bash -c "`wget -O- babushka.me/up/hard`"}, default_opts)
+    def bootstrap args = []
+      cloud_adapter.execute(instance_name, %Q{bash -c "`wget -O- babushka.me/up/#{[*args].push('hard').uniq.join(',')}`"}, default_opts)
     end
 
     def babushka taskname, vars = {}
@@ -11,12 +11,7 @@ module Dollhouse
       if vars == :no_defaults
         cloud_adapter.execute(instance_name, "babushka '#{taskname}'", default_opts)
       else
-        if !vars.empty?
-          write_file(".babushka/vars/#{taskname}", {
-            :vars => vars.map_keys(&:to_s).map_values { |v| {:value => v} }
-          }.to_yaml)
-        end
-        cloud_adapter.execute(instance_name, "babushka '#{taskname}' --defaults", default_opts)
+        cloud_adapter.execute(instance_name, "babushka '#{taskname}' --defaults #{cmdline_vars(vars)}", default_opts)
       end
     end
 
@@ -28,6 +23,10 @@ module Dollhouse
       cloud_adapter.write_file(instance_name, path, content, default_opts.merge(opts))
     end
 
+    def locally &blk
+      local_adapter.instance_eval &blk
+    end
+
     def as user, opts = {}, &blk
       old_user = self.user
       old_password = self.password
@@ -69,9 +68,18 @@ module Dollhouse
       opts
     end
 
+    def cmdline_vars vars
+      vars.keys.map {|key|
+        %{#{key}="#{vars[key].strip.gsub('"', '\"')}"}
+      }.join(' ')
+    end
+
     # This could return different adapters, that connect to servers in different ways. For now we have a simple
     def cloud_adapter
       @cloud_adapter ||= ManualConfig.new
     end
+    def local_adapter
+      @local_adapter ||= LocalAdapter.new
+    end
   end
 end

data/lib/dollhouse/local_adapter.rb

@@ -0,0 +1,26 @@
+module Dollhouse
+  class LocalAdapter
+    def babushka taskname, vars = {}
+      if !vars.empty?
+        write_file("~/.babushka/vars/#{taskname}", {
+          :vars => vars.map_keys(&:to_s).map_values {|v| {:value => v} }
+        }.to_yaml)
+      end
+      shell "babushka '#{taskname}' --defaults"
+    end
+
+    def shell cmd, opts = {}
+      puts "Running #{cmd}"
+      output = `#{cmd}`
+      puts output
+      $? == 0
+    end
+
+    def write_file path, content
+      puts "Writing to #{path}"
+      File.open(File.expand_path(path), "w") {|f|
+        f << content
+      }
+    end
+  end
+end

data/lib/dollhouse/version.rb

@@ -1,3 +1,3 @@
 module Dollhouse
-  VERSION = "0.2.1" unless defined?(Dollhouse::VERSION)
+  VERSION = "0.2.2" unless defined?(Dollhouse::VERSION)
 end

metadata

@@ -1,144 +1,90 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: dollhouse
-version: !ruby/object:Gem::Version 
-  hash: 21
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 1
-  version: 0.2.1
+version: !ruby/object:Gem::Version
+  version: 0.2.2
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Glen Maddern
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-01-18 00:00:00 +11:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-01-02 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: main
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70137320130120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 55
-        segments: 
-        - 4
-        - 2
-        - 0
+      - !ruby/object:Gem::Version
         version: 4.2.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: fog
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70137320130120
+- !ruby/object:Gem::Dependency
+  name: fog
+  requirement: &70137320129400 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 43
-        segments: 
-        - 0
-        - 2
-        - 30
+      - !ruby/object:Gem::Version
         version: 0.2.30
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: net-ssh
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70137320129400
+- !ruby/object:Gem::Dependency
+  name: net-ssh
+  requirement: &70137320128800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 33
-        segments: 
-        - 2
-        - 0
-        - 23
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.0.23
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: net-sftp
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70137320128800
+- !ruby/object:Gem::Dependency
+  name: net-sftp
+  requirement: &70137320128200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        - 0
-        - 4
+      - !ruby/object:Gem::Version
         version: 2.0.4
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: cucumber
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 61
-        segments: 
-        - 0
-        - 9
-        - 3
-        version: 0.9.3
-  type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70137320128200
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &70137320127020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 0
-        - 8
-        - 7
-        version: 0.8.7
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *70137320127020
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70137320126300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 0
-        - 0
-        version: 2.0.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
-description: Dollhouse is a way to deploy servers. It is designed to be used with Babushka.
+  prerelease: false
+  version_requirements: *70137320126300
+description: Dollhouse is a way to deploy servers. It is designed to be used with
+  Babushka.
 email: glen.maddern@gmail.com
-executables: 
+executables:
 - dollhouse
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - bin/dollhouse
 - lib/core_ext/hash.rb
 - lib/dollhouse/config_loader.rb
@@ -146,6 +92,7 @@ files:
 - lib/dollhouse/dollhouse.rb
 - lib/dollhouse/instance.rb
 - lib/dollhouse/instances.rb
+- lib/dollhouse/local_adapter.rb
 - lib/dollhouse/manual_config.rb
 - lib/dollhouse/remote_server.rb
 - lib/dollhouse/server.rb
@@ -153,41 +100,28 @@ files:
 - lib/dollhouse.rb
 - LICENSE
 - README.md
-has_rdoc: true
 homepage: http://github.com/geelen/dollhouse
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: dollhouse
-rubygems_version: 1.3.7
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: A place to manage your babushkas.
 test_files: []
-