engineyard-serverside 1.2.0 → 1.2.1

data/lib/engineyard-serverside/configuration.rb

@@ -44,6 +44,10 @@ module EY
       end
     end
 
+    def to_json
+      configuration.to_json
+    end
+
     def node
       EY.node
     end

data/lib/engineyard-serverside/deploy.rb

@@ -126,7 +126,7 @@ module EY
                               get_bundler_installer(lockfile)
                             else
                               warn_about_missing_lockfile
-                              BundleInstaller.new(DEFAULT_09_BUNDLER, "--without=development --without=test")
+                              BundleInstaller.new(default_09_bundler, "--without=development --without=test")
                             end
 
         sudo "#{$0} _#{VERSION}_ install_bundler #{bundler_installer.version}"
@@ -220,13 +220,19 @@ module EY
     def callback(what)
       @callbacks_reached ||= true
       if File.exist?("#{c.release_path}/deploy/#{what}.rb")
-        eydeploy_path = $0   # invoke others just like we were invoked
-        run "#{eydeploy_path} _#{VERSION}_ hook '#{what}' --app '#{config.app}' --release-path #{config.release_path}" do |server, cmd|
-          cmd << " --framework-env '#{c.environment}'"
-          cmd << " --current-role '#{server.role}'"
-          cmd << " --current-name '#{server.name}'" if server.name
-          cmd << " --config '#{c[:config]}'" if c.has_key?(:config)
-          cmd
+        base_command = [$0, "_#{VERSION}_", 'hook', what.to_s,
+          '--app', config.app.to_s,
+          '--release-path', config.release_path.to_s,
+        ]
+
+        run Escape.shell_command(base_command) do |server, cmd|
+          per_instance_args = [
+            '--framework-env', c.environment.to_s,
+            '--current-role', server.role.to_s,
+            '--config', c.to_json,
+          ]
+          per_instance_args << '--current-name' << server.name.to_s if server.name
+          cmd << " " << Escape.shell_command(per_instance_args)
         end
       end
     end
@@ -268,9 +274,6 @@ module EY
       sudo "rm -rf #{c.release_path}"
     end
 
-    DEFAULT_09_BUNDLER = '0.9.26'
-    DEFAULT_10_BUNDLER = '1.0.0.rc.3'
-
     def warn_about_missing_lockfile
       info "!>"
       info "!> WARNING: Gemfile.lock is missing!"
@@ -281,7 +284,7 @@ module EY
       info "!> Fix this by running \"git add Gemfile.lock; git commit\" and deploying again."
       info "!> If you don't have a Gemfile.lock, run \"bundle lock\" to create one."
       info "!>"
-      info "!> This deployment will use bundler #{DEFAULT_09_BUNDLER} to run 'bundle install'."
+      info "!> This deployment will use bundler #{default_09_bundler} to run 'bundle install'."
       info "!>"
     end
 
@@ -290,11 +293,11 @@ module EY
       case parser.lockfile_version
       when :bundler09
         BundleInstaller.new(
-          parser.bundler_version || DEFAULT_09_BUNDLER,
+          parser.bundler_version || default_09_bundler,
           "--without=development --without=test")
       when :bundler10
         BundleInstaller.new(
-          parser.bundler_version || DEFAULT_10_BUNDLER,
+          parser.bundler_version || default_10_bundler,
           "--deployment --path #{c.shared_path}/bundled_gems --without development test"
           )
       else
@@ -303,6 +306,9 @@ module EY
     end
     public :get_bundler_installer
 
+    def default_09_bundler() "0.9.26"     end
+    def default_10_bundler() "1.0.0.rc.6" end
+
   end   # DeployBase
 
   class Deploy < DeployBase

data/lib/engineyard-serverside/deploy_hook.rb

@@ -57,9 +57,6 @@ module EY
       # convenience functions for running on certain instance types
       def on_app_master(&blk)                 on_roles(%w[solo app_master],          &blk) end
       def on_app_servers(&blk)                on_roles(%w[solo app_master app],      &blk) end
-      def on_db_master(&blk)                  on_roles(%w[solo db_master],           &blk) end
-      def on_db_slaves(&blk)                  on_roles(%w[db_slave],                 &blk) end
-      def on_db_servers(&blk)                 on_roles(%w[solo db_master db_slave],  &blk) end
       def on_app_servers_and_utilities(&blk)  on_roles(%w[solo app_master app util], &blk) end
 
       def on_utilities(*names, &blk)

data/lib/engineyard-serverside/version.rb

@@ -1,3 +1,3 @@
 module EY
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 end

data/lib/engineyard-serverside/version_flymake.rb

@@ -0,0 +1,3 @@
+module EY
+  VERSION = '1.2.1'
+end

data/spec/deploy_hook_spec.rb

@@ -157,18 +157,6 @@ describe "the deploy-hook API" do
       where_code_runs_with(:on_app_servers).should == %w(solo app_master app)
     end
 
-    it "#on_db_master runs on DB masters and solos" do
-      where_code_runs_with(:on_db_master).should == %w(solo db_master)
-    end
-
-    it "#on_db_slaves runs on DB slaves only (not solos or masters)" do
-      where_code_runs_with(:on_db_slaves).should == %w(db_slave)
-    end
-
-    it "#on_db_servers runs on DB masters, DB slaves, and solos" do
-      where_code_runs_with(:on_db_servers).should == %w(solo db_master db_slave)
-    end
-
     it "#on_app_servers_and_utilities does what it says on the tin" do
       where_code_runs_with(:on_app_servers_and_utilities).should ==
         %w(solo app_master app util_alpha util_beta util_gamma)

data/spec/lockfile_parser_spec.rb

@@ -3,12 +3,12 @@ require File.dirname(__FILE__) + '/spec_helper'
 describe "the bundler version retrieved from the lockfile" do
   def get_version(file)
     full_path = File.expand_path("../support/lockfiles/#{file}", __FILE__)
-    config = EY::Deploy::Configuration.new('deploy_to' => 'dontcare')
-    EY::DeployBase.new(config).get_bundler_installer(full_path).version
+    @config = EY::Deploy::Configuration.new('deploy_to' => 'dontcare')
+    EY::DeployBase.new(@config).get_bundler_installer(full_path).version
   end
 
   it "returns the default version for an 0.9 lockfile without a bundler dependency" do
-    get_version('0.9-no-bundler').should == EY::DeployBase::DEFAULT_09_BUNDLER
+    get_version('0.9-no-bundler').should == EY::DeployBase.new(@config).send(:default_09_bundler)
   end
 
   it "gets the version from an 0.9 lockfile with a bundler dependency" do
@@ -16,7 +16,7 @@ describe "the bundler version retrieved from the lockfile" do
   end
 
   it "returns the default version for a 1.0 lockfile without a bundler dependency" do
-    get_version('1.0-no-bundler').should == EY::DeployBase::DEFAULT_10_BUNDLER
+    get_version('1.0-no-bundler').should == EY::DeployBase.new(@config).send(:default_10_bundler)
   end
 
   it "gets the version from a 1.0.0.rc.1 lockfile w/dependency on 1.0.0.rc.1" do

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: engineyard-serverside
 version: !ruby/object:Gem::Version 
+  hash: 29
   prerelease: false
   segments: 
   - 1
   - 2
-  - 0
-  version: 1.2.0
+  - 1
+  version: 1.2.1
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-16 00:00:00 -07:00
+date: 2010-08-25 00:00:00 -07:00
 default_executable: engineyard-serverside
 dependencies: []
 
@@ -40,6 +41,7 @@ files:
 - lib/engineyard-serverside/strategies/git.rb
 - lib/engineyard-serverside/task.rb
 - lib/engineyard-serverside/version.rb
+- lib/engineyard-serverside/version_flymake.rb
 - lib/engineyard-serverside.rb
 - lib/vendor/dataflow/dataflow/actor.rb
 - lib/vendor/dataflow/dataflow/equality.rb
@@ -232,8 +234,22 @@ files:
 - lib/vendor/thor/thor.gemspec
 - lib/vendor/thor/Thorfile
 - LICENSE
+- spec/custom_deploy_spec.rb
+- spec/deploy_hook_spec.rb
+- spec/fixtures/gitrepo/foo
+- spec/fixtures/gitrepo.tar.gz
+- spec/fixtures/invalid_hook.rb
+- spec/fixtures/valid_hook.rb
+- spec/git_strategy_spec.rb
+- spec/lockfile_parser_spec.rb
+- spec/spec_helper.rb
+- spec/support/lockfiles/0.9-no-bundler
+- spec/support/lockfiles/0.9-with-bundler
+- spec/support/lockfiles/1.0-no-bundler
+- spec/support/lockfiles/1.0.0.rc.1-with-bundler
+- spec/support/lockfiles/not-a-lockfile
 has_rdoc: true
-homepage: http://engineyard.com
+homepage: http://github.com/engineyard/engineyard-serverside
 licenses: []
 
 post_install_message: 
@@ -242,23 +258,27 @@ rdoc_options: []
 require_paths: 
 - lib
 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 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A gem that deploys ruby applications on EY Cloud instances