ey-deploy 0.6.1 → 0.7.0

data/lib/ey-deploy/cli.rb

@@ -30,6 +30,9 @@ module EY
     method_option :config,    :type     => :string,
                               :desc     => "Additional configuration"
 
+    method_option :stack,     :type     => :string,
+                              :desc     => "Web stack (so we can restart it correctly)"
+
     method_option :instances, :type     => :array,
                               :desc     => "Instances in cluster"
 
@@ -60,6 +63,21 @@ module EY
       EY::DeployHook.new(options).run(hook_name)
     end
 
+    desc "install_bundler [VERSION]", "Make sure VERSION of bundler is installed (in system ruby)"
+    def install_bundler(version)
+      egrep_escaped_version = version.gsub(/\./, '\.')
+      # the grep "bundler " is so that gems like bundler08 don't get
+      # their versions considered too
+      #
+      # the [,$] is to stop us from looking for e.g. 0.9.2, seeing
+      # 0.9.22, and mistakenly thinking 0.9.2 is there
+      has_bundler_cmd = "gem list bundler | grep \"bundler \" | egrep -q '#{egrep_escaped_version}[,)]'"
+
+      unless system(has_bundler_cmd)
+        system("gem install bundler -q --no-rdoc --no-ri -v '#{version}'")
+      end
+    end
+
     desc "propagate", "Propagate the ey-deploy gem to the other instances in the cluster. This will install exactly version #{VERSION} and remove other versions if found."
     def propagate
       config          = EY::Deploy::Configuration.new
@@ -73,8 +91,11 @@ module EY
       EY::Server.all.find_all do |server|
         !server.local?            # of course this machine has it
       end.find_all do |server|
-        has_gem_cmd = "/usr/local/ey_resin/ruby/bin/gem list ey-deploy | grep -q '(#{VERSION})'"
-        !server.run(has_gem_cmd)  # doesn't have only this exact version
+        egrep_escaped_version = VERSION.gsub(/\./, '\.')
+        # the [,)] is to stop us from looking for e.g. 0.5.1, seeing
+        # 0.5.11, and mistakenly thinking 0.5.1 is there
+        has_gem_cmd = "#{gem_binary} list ey-deploy | grep \"ey-deploy \" | egrep -q '#{egrep_escaped_version}[,)]'"
+        !server.run(has_gem_cmd)  # doesn't have this exact version
       end.each do |server|
         puts "~> Installing ey-deploy on #{server.hostname}"
 
@@ -84,7 +105,6 @@ module EY
               local_gem_file,
               "#{config.user}@#{server.hostname}:#{remote_gem_file}",
             ]))
-        server.run("sudo #{gem_binary} uninstall -a -x ey-deploy 2>/dev/null")
         server.run("sudo #{gem_binary} install --no-rdoc --no-ri '#{remote_gem_file}'")
       end
     end

data/lib/ey-deploy/configuration.rb

@@ -57,10 +57,6 @@ module EY
       configuration['repository_cache'] || File.join(deploy_to, "/shared/cached-copy")
     end
 
-    def repo
-      configuration['repo']
-    end
-
     def deploy_to
       configuration['deploy_to'] || "/data/#{app}"
     end
@@ -86,10 +82,6 @@ module EY
       @copy_exclude ||= Array(configuration.fetch("copy_exclude", []))
     end
 
-    def stack
-      node['environment']['stack']
-    end
-
     def environment
       node['environment']['framework_env']
     end

data/lib/ey-deploy/deploy.rb

@@ -1,6 +1,8 @@
 # stolen wholesale from capistrano, thanks Jamis!
+require 'base64'
 require 'fileutils'
 require 'json'
+require 'yaml'
 
 module EY
   class DeployBase < Task
@@ -113,11 +115,20 @@ module EY
 
     # task
     def bundle
-      roles :app_master, :app, :solo do
-        if File.exist?("#{c.latest_release}/Gemfile")
-          puts "~> Gemfile detected, bundling gems"
-          run "cd #{c.latest_release} && bundle install"
-        end
+      if File.exist?("#{c.latest_release}/Gemfile")
+        puts "~> Gemfile detected, bundling gems"
+        lockfile = File.join(c.latest_release, "Gemfile.lock")
+
+        bundler_version = if File.exist?(lockfile)
+                            get_bundler_version(lockfile)
+                          else
+                            warn_about_missing_lockfile
+                            DEFAULT_09_BUNDLER
+                          end
+
+        sudo "#{$0} _#{VERSION}_ install_bundler #{bundler_version}"
+
+        run "cd #{c.latest_release} && bundle _#{bundler_version}_ install --without=development --without=test"
       end
     end
 
@@ -201,7 +212,7 @@ module EY
       @callbacks_reached ||= true
       if File.exist?("#{c.latest_release}/deploy/#{what}.rb")
         eysd_path = $0   # invoke others just like we were invoked
-        run "#{eysd_path} hook '#{what}' --app '#{config.app}' --release-path #{config.release_path}" do |server, cmd|
+        run "#{eysd_path} _#{VERSION}_ hook '#{what}' --app '#{config.app}' --release-path #{config.release_path}" do |server, cmd|
           cmd << " --current-role '#{server.role}'"
           cmd << " --current-name '#{server.name}'" if server.name
           cmd
@@ -245,7 +256,55 @@ module EY
     def cleanup_latest_release
       sudo "rm -rf #{c.latest_release}"
     end
-  end
+
+    def safe_yaml_load(loadable)
+      YAML.load(loadable)
+    rescue ArgumentError   # not yaml
+      nil
+    end
+
+    DEFAULT_09_BUNDLER = '0.9.26'
+    DEFAULT_10_BUNDLER = '1.0.0.beta.1'
+
+    def warn_about_missing_lockfile
+      puts "!>"
+      puts "!> WARNING: Gemfile.lock is missing!"
+      puts "!> You can get different gems in production than what you tested with."
+      puts "!> You can get different gems on every deployment even if your Gemfile hasn't changed."
+      puts "!> Deploying may take a long time."
+      puts "!>"
+      puts "!> Fix this by running \"git add Gemfile.lock; git commit\" and deploying again."
+      puts "!> If you don't have a Gemfile.lock, run \"bundle lock\" to create one."
+      puts "!>"
+      puts "!> This deployment will use bundler #{DEFAULT_09_BUNDLER} to run 'bundle install'."
+      puts "!>"
+    end
+
+    def get_bundler_version(lockfile)
+      contents = File.open(lockfile, 'r') { |f| f.read }
+      from_yaml = safe_yaml_load(contents)
+
+      if from_yaml                        # 0.9
+        from_yaml['specs'].map do |spec|
+          # spec is a one-element hash: the key is the gem name, and
+          # the value is {"version" => the-version}.
+          if spec.keys.first == "bundler"
+            spec.values.first["version"]
+          end
+        end.compact.first || DEFAULT_09_BUNDLER
+      else                                # 1.0 or bust
+        gem_section = contents.scan(/GEM\s*\n(.*?)\n\S/m).first
+        unless gem_section
+          raise "Couldn't parse #{lockfile}; exiting"
+          exit(1)
+        end
+        result = gem_section.first.scan(/^\s*bundler\s*\((\S+)\)/).first
+        result ? result.first : DEFAULT_10_BUNDLER
+      end
+    end
+    public :get_bundler_version
+
+  end   # DeployBase
 
   class Deploy < DeployBase
     def self.new(opts={})

data/lib/ey-deploy/version.rb

@@ -1,3 +1,3 @@
 module EY
-  VERSION = '0.6.1'
+  VERSION = '0.7.0'
 end

data/spec/lockfile_parser_spec.rb

@@ -0,0 +1,28 @@
+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__)
+    EY::DeployBase.new({}).get_bundler_version(full_path)
+  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
+  end
+
+  it "gets the version from an 0.9 lockfile with a bundler dependency" do
+    get_version('0.9-with-bundler').should == '0.9.24'
+  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
+  end
+
+  it "gets the version from a 1.0 lockfile with a bundler dependency" do
+    get_version('1.0-with-bundler').should == '1.0.0.beta.1'
+  end
+
+  it "raises an error if it can't parse the file" do
+    lambda { get_version('not-a-lockfile') }.should raise_error
+  end
+end

data/spec/support/lockfiles/0.9-no-bundler

@@ -0,0 +1,111 @@
+---
+dependencies:
+  ruby-debug:
+    group:
+    - :test
+    version: ">= 0"
+  fakeweb:
+    group:
+    - :test
+    version: ">= 0"
+  termios:
+    group:
+    - :default
+    version: ">= 0"
+  fakefs:
+    group:
+    - :test
+    version: ">= 0"
+  highline:
+    group:
+    - :default
+    version: ~> 1.5.2
+  rake:
+    group:
+    - :test
+    version: ">= 0"
+  realweb:
+    group:
+    - :test
+    version: ~> 0.1.6
+  escape:
+    group:
+    - :default
+    version: ~> 0.0.4
+  thor:
+    group:
+    - :default
+    version: ~> 0.13.6
+  rspec:
+    group:
+    - :test
+    version: ">= 0"
+    require:
+    - spec
+  sinatra:
+    group:
+    - :test
+    version: ">= 0"
+  json:
+    group:
+    - :default
+    version: ~> 1.4.0
+  rest-client:
+    group:
+    - :default
+    version: ~> 1.4
+    require:
+    - rest_client
+  fakeweb-matcher:
+    group:
+    - :test
+    version: ">= 0"
+  open4:
+    group:
+    - :test
+    version: ">= 0"
+specs:
+- rake:
+    version: 0.8.7
+- columnize:
+    version: 0.3.1
+- escape:
+    version: 0.0.4
+- fakefs:
+    version: 0.2.1
+- fakeweb:
+    version: 1.2.8
+- rspec:
+    version: 1.3.0
+- fakeweb-matcher:
+    version: 1.1.0
+- highline:
+    version: 1.5.2
+- json:
+    version: 1.4.3
+- linecache:
+    version: "0.43"
+- mime-types:
+    version: "1.16"
+- open4:
+    version: 1.0.1
+- rack:
+    version: 1.2.1
+- realweb:
+    version: 0.1.6
+- rest-client:
+    version: 1.5.1
+- ruby-debug-base:
+    version: 0.10.3
+- ruby-debug:
+    version: 0.10.3
+- sinatra:
+    version: "1.0"
+- termios:
+    version: 0.9.4
+- thor:
+    version: 0.13.6
+hash: fbfa26af5a1ec9a59367fdd0ea866373166d06f0
+sources:
+- Rubygems:
+    uri: http://gemcutter.org

data/spec/support/lockfiles/0.9-with-bundler

@@ -0,0 +1,117 @@
+---
+dependencies:
+  ruby-debug:
+    group:
+    - :test
+    version: ">= 0"
+  fakeweb:
+    group:
+    - :test
+    version: ">= 0"
+  termios:
+    group:
+    - :default
+    version: ">= 0"
+  fakefs:
+    group:
+    - :test
+    version: ">= 0"
+  highline:
+    group:
+    - :default
+    version: ~> 1.5.2
+  rake:
+    group:
+    - :test
+    version: ">= 0"
+  realweb:
+    group:
+    - :test
+    version: ~> 0.1.6
+  escape:
+    group:
+    - :default
+    version: ~> 0.0.4
+  thor:
+    group:
+    - :default
+    version: ~> 0.13.6
+  rspec:
+    group:
+    - :test
+    version: ">= 0"
+    require:
+    - spec
+  sinatra:
+    group:
+    - :test
+    version: ">= 0"
+  json:
+    group:
+    - :default
+    version: ~> 1.4.0
+  rest-client:
+    group:
+    - :default
+    version: ~> 1.4
+    require:
+    - rest_client
+  bundler:
+    group:
+    - :test
+    version: ">= 0"
+  fakeweb-matcher:
+    group:
+    - :test
+    version: ">= 0"
+  open4:
+    group:
+    - :test
+    version: ">= 0"
+specs:
+- rake:
+    version: 0.8.7
+- bundler:
+    version: 0.9.24
+- columnize:
+    version: 0.3.1
+- escape:
+    version: 0.0.4
+- fakefs:
+    version: 0.2.1
+- fakeweb:
+    version: 1.2.8
+- rspec:
+    version: 1.3.0
+- fakeweb-matcher:
+    version: 1.1.0
+- highline:
+    version: 1.5.2
+- json:
+    version: 1.4.3
+- linecache:
+    version: "0.43"
+- mime-types:
+    version: "1.16"
+- open4:
+    version: 1.0.1
+- rack:
+    version: 1.2.1
+- realweb:
+    version: 0.1.6
+- rest-client:
+    version: 1.5.1
+- ruby-debug-base:
+    version: 0.10.3
+- ruby-debug:
+    version: 0.10.3
+- sinatra:
+    version: "1.0"
+- termios:
+    version: 0.9.4
+- thor:
+    version: 0.13.6
+hash: fbfa26af5a1ec9a59367fdd0ea866373166d06f0
+sources:
+- Rubygems:
+    uri: http://gemcutter.org

data/spec/support/lockfiles/1.0-no-bundler

@@ -0,0 +1,54 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    columnize (0.3.1)
+    escape (0.0.4)
+    fakefs (0.2.1)
+    fakeweb (1.2.8)
+    fakeweb-matcher (1.1.0)
+      fakeweb (>= 1.2.5)
+      rspec (>= 1.2.0)
+    highline (1.5.2)
+    json (1.4.3)
+    json (1.4.3-x86-mingw32)
+    json (1.4.3-x86-mswin32)
+    linecache (0.43)
+    linecache (0.43-mswin32)
+    mime-types (1.16)
+    open4 (1.0.1)
+    rack (1.2.1)
+    rake (0.8.7)
+    realweb (0.1.6)
+      rack (>= 1.1.0)
+    rest-client (1.5.1)
+      mime-types (>= 1.16)
+    rspec (1.3.0)
+    ruby-debug (0.10.3)
+      columnize (>= 0.1)
+      ruby-debug-base (~> 0.10.3.0)
+    ruby-debug-base (0.10.3)
+      linecache (>= 0.3)
+    sinatra (1.0)
+      rack (>= 1.0)
+    termios (0.9.4)
+    thor (0.13.6)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  escape (~> 0.0.4)
+  fakefs
+  fakeweb
+  fakeweb-matcher
+  highline (~> 1.5.2)
+  json (~> 1.4.0)
+  open4
+  rake
+  realweb (~> 0.1.6)
+  rest-client (~> 1.4)
+  rspec
+  ruby-debug
+  sinatra
+  termios
+  thor (~> 0.13.6)

data/spec/support/lockfiles/1.0-with-bundler

@@ -0,0 +1,56 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    bundler (1.0.0.beta.1)
+    columnize (0.3.1)
+    escape (0.0.4)
+    fakefs (0.2.1)
+    fakeweb (1.2.8)
+    fakeweb-matcher (1.1.0)
+      fakeweb (>= 1.2.5)
+      rspec (>= 1.2.0)
+    highline (1.5.2)
+    json (1.4.3)
+    json (1.4.3-x86-mingw32)
+    json (1.4.3-x86-mswin32)
+    linecache (0.43)
+    linecache (0.43-mswin32)
+    mime-types (1.16)
+    open4 (1.0.1)
+    rack (1.2.1)
+    rake (0.8.7)
+    realweb (0.1.6)
+      rack (>= 1.1.0)
+    rest-client (1.5.1)
+      mime-types (>= 1.16)
+    rspec (1.3.0)
+    ruby-debug (0.10.3)
+      columnize (>= 0.1)
+      ruby-debug-base (~> 0.10.3.0)
+    ruby-debug-base (0.10.3)
+      linecache (>= 0.3)
+    sinatra (1.0)
+      rack (>= 1.0)
+    termios (0.9.4)
+    thor (0.13.6)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler
+  escape (~> 0.0.4)
+  fakefs
+  fakeweb
+  fakeweb-matcher
+  highline (~> 1.5.2)
+  json (~> 1.4.0)
+  open4
+  rake
+  realweb (~> 0.1.6)
+  rest-client (~> 1.4)
+  rspec
+  ruby-debug
+  sinatra
+  termios
+  thor (~> 0.13.6)

data/spec/support/lockfiles/not-a-lockfile

@@ -0,0 +1,10 @@
+require 'spec/rake/spectask'
+Spec::Rake::SpecTask.new(:spec) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.spec_files = FileList['spec/**/*_spec.rb']
+end
+task :default => :spec
+
+require 'rake/rdoctask'
+
+$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 6
-  - 1
-  version: 0.6.1
+  - 7
+  - 0
+  version: 0.7.0
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-23 00:00:00 -07:00
+date: 2010-06-25 00:00:00 -07:00
 default_executable: eysd
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -144,4 +144,10 @@ summary: A gem that deploys ruby applications on EY Cloud instances
 test_files: 
 - spec/custom_deploy_spec.rb
 - spec/deploy_hook_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-with-bundler
+- spec/support/lockfiles/not-a-lockfile