ey-deploy 1.0.1 → 1.0.2

data/lib/ey-deploy.rb

@@ -15,6 +15,7 @@ require 'task'
 require 'server'
 require 'deploy'
 require 'deploy_hook'
+require 'lockfile_parser'
 require 'cli'
 require 'configuration'
 

data/lib/ey-deploy/deploy.rb

@@ -2,7 +2,6 @@
 require 'base64'
 require 'fileutils'
 require 'json'
-require 'yaml'
 
 module EY
   class DeployBase < Task
@@ -269,14 +268,8 @@ module EY
       sudo "rm -rf #{c.release_path}"
     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.5'
+    DEFAULT_10_BUNDLER = '1.0.0.rc.1'
 
     def warn_about_missing_lockfile
       info "!>"
@@ -293,25 +286,15 @@ module EY
     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
+      parser = LockfileParser.new(File.read(lockfile))
+      return parser.bundler_version if parser.bundler_version
+      case parser.lockfile_version
+      when :bundler09
+        DEFAULT_09_BUNDLER
+      when :bundler10
+        DEFAULT_10_BUNDLER
+      else
+        raise "Unknown lockfile version #{parser.lockfile_version}"
       end
     end
     public :get_bundler_version

data/lib/ey-deploy/lockfile_parser.rb

@@ -0,0 +1,55 @@
+require 'yaml'
+module EY
+  class LockfileParser
+
+    attr_reader :bundler_version, :lockfile_version
+
+    def initialize(lockfile_contents)
+      @contents = lockfile_contents
+      @lockfile_version, @bundler_version = parse
+    end
+
+    private
+    def parse
+      from_yaml = safe_yaml_load(@contents)
+      if from_yaml                        # 0.9
+        bundler_version = 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
+        [:bundler09, bundler_version]
+      else                                # 1.0 or bust
+        dep_section = ""
+        in_dependencies_section = false
+        @contents.each_line do |line|
+          if line =~ /^DEPENDENCIES/
+            in_dependencies_section = true
+          elsif line =~ /^\S/
+            in_dependencies_section = false
+          elsif in_dependencies_section
+            dep_section << line
+          end
+        end
+
+        unless dep_section.length > 0
+          raise "Couldn't parse #{lockfile}; exiting"
+          exit(1)
+        end
+
+        result = dep_section.scan(/^\s*bundler\s*\(=\s*([^\)]+)\)/).first
+        bundler_version = result ? result.first : nil
+        [:bundler10, bundler_version]
+      end
+    end
+
+    def safe_yaml_load(loadable)
+      YAML.load(loadable)
+    rescue ArgumentError   # not yaml
+      nil
+    end
+
+  end
+end

data/lib/ey-deploy/version.rb

@@ -1,3 +1,3 @@
 module EY
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

data/spec/lockfile_parser_spec.rb

@@ -18,8 +18,9 @@ describe "the bundler version retrieved from the lockfile" 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'
+  it "gets the version from a 1.0.0.rc.1 lockfile w/dependency on 1.0.0.rc.1" do
+    # This is a real, customer-generated lockfile
+    get_version('1.0.0.rc.1-with-bundler').should == '1.0.0.rc.1'
   end
 
   it "raises an error if it can't parse the file" do

data/spec/support/lockfiles/1.0.0.rc.1-with-bundler

@@ -0,0 +1,162 @@
+GIT
+  remote: git://github.com/bensie/aws-s3.git
+  revision: 00831fe
+  specs:
+    aws-s3 (0.6.2)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    abstract (1.0.0)
+    actionmailer (3.0.0.rc)
+      actionpack (= 3.0.0.rc)
+      mail (~> 2.2.5)
+    actionpack (3.0.0.rc)
+      activemodel (= 3.0.0.rc)
+      activesupport (= 3.0.0.rc)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.4.1)
+      rack (~> 1.2.1)
+      rack-mount (~> 0.6.9)
+      rack-test (~> 0.5.4)
+      tzinfo (~> 0.3.22)
+    activemodel (3.0.0.rc)
+      activesupport (= 3.0.0.rc)
+      builder (~> 2.1.2)
+      i18n (~> 0.4.1)
+    activerecord (3.0.0.rc)
+      activemodel (= 3.0.0.rc)
+      activesupport (= 3.0.0.rc)
+      arel (~> 0.4.0)
+      tzinfo (~> 0.3.22)
+    activeresource (3.0.0.rc)
+      activemodel (= 3.0.0.rc)
+      activesupport (= 3.0.0.rc)
+    activesupport (3.0.0.rc)
+    acts_as_list (0.1.2)
+    acts_as_tree (0.1.1)
+    arel (0.4.0)
+      activesupport (>= 3.0.0.beta)
+    bcrypt-ruby (2.1.2)
+    builder (2.1.2)
+    configuration (1.1.0)
+    daemons (1.1.0)
+    delayed_job (2.0.3)
+      daemons
+    devise (1.1.1)
+      bcrypt-ruby (~> 2.1.2)
+      warden (~> 0.10.7)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    escape (0.0.4)
+    exifr (1.0.1)
+    factory_girl (1.3.1)
+    factory_girl_rails (1.0)
+      factory_girl (~> 1.3)
+      rails (>= 3.0.0.beta4)
+    haml (3.0.14)
+    heroku (1.9.11)
+      json_pure (>= 1.2.0, < 1.5.0)
+      launchy (~> 0.3.2)
+      rest-client (~> 1.4.0)
+    hoptoad_notifier (2.3.2)
+      activesupport
+    i18n (0.4.1)
+    json_pure (1.4.3)
+    launchy (0.3.7)
+      configuration (>= 0.0.5)
+      rake (>= 0.8.1)
+    less (1.2.21)
+      mutter (>= 0.4.2)
+      treetop (>= 1.4.2)
+    liquid (2.1.2)
+    mail (2.2.5)
+      activesupport (>= 2.3.6)
+      mime-types
+      treetop (>= 1.4.5)
+    mime-types (1.16)
+    mutter (0.5.3)
+    mysql (2.8.1)
+    paperclip (2.3.3)
+      activerecord
+      activesupport
+    permalink_fu (1.0.0)
+    polyglot (0.3.1)
+    rack (1.2.1)
+    rack-mount (0.6.9)
+      rack (>= 1.0.0)
+    rack-test (0.5.4)
+      rack (>= 1.0)
+    rails (3.0.0.rc)
+      actionmailer (= 3.0.0.rc)
+      actionpack (= 3.0.0.rc)
+      activerecord (= 3.0.0.rc)
+      activeresource (= 3.0.0.rc)
+      activesupport (= 3.0.0.rc)
+      bundler (>= 1.0.0.rc.1)
+      railties (= 3.0.0.rc)
+    railties (3.0.0.rc)
+      actionpack (= 3.0.0.rc)
+      activesupport (= 3.0.0.rc)
+      rake (>= 0.8.3)
+      thor (~> 0.14.0)
+    rake (0.8.7)
+    redis (2.0.3)
+    refraction (0.2.0)
+    rest-client (1.4.2)
+      mime-types (>= 1.16)
+    rsolr (0.12.1)
+      builder (>= 2.1.2)
+    shoulda (2.11.1)
+    sinatra (1.0)
+      rack (>= 1.0)
+    sunspot (1.1.0)
+      escape (= 0.0.4)
+      rsolr (= 0.12.1)
+    sunspot_rails (1.1.0)
+      sunspot (= 1.1.0)
+    thor (0.14.0)
+    treetop (1.4.8)
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.22)
+    vestal_versions (1.0.2)
+      activerecord (>= 2.1.0)
+    warden (0.10.7)
+      rack (>= 1.0.0)
+    will_paginate (3.0.pre2)
+    xml-simple (1.0.12)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  acts_as_list (= 0.1.2)
+  acts_as_tree (= 0.1.1)
+  aws-s3 (= 0.6.2)!
+  builder
+  bundler (= 1.0.0.rc.1)
+  delayed_job (= 2.0.3)
+  devise (= 1.1.1)
+  exifr (= 1.0.1)
+  factory_girl_rails (= 1.0)
+  haml (= 3.0.14)
+  heroku (= 1.9.11)
+  hoptoad_notifier (= 2.3.2)
+  less (= 1.2.21)
+  liquid (= 2.1.2)
+  mime-types (= 1.16)
+  mysql (= 2.8.1)
+  paperclip (= 2.3.3)
+  permalink_fu (= 1.0.0)
+  rails (= 3.0.0.rc)
+  redis (= 2.0.3)
+  refraction (= 0.2.0)
+  rsolr (= 0.12.1)
+  shoulda (= 2.11.1)
+  sinatra (= 1.0)
+  sunspot (= 1.1.0)
+  sunspot_rails (= 1.1.0)
+  vestal_versions (= 1.0.2)
+  will_paginate (= 3.0.pre2)
+  xml-simple

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ey-deploy
 version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: false
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-22 00:00:00 -07:00
+date: 2010-07-29 00:00:00 -07:00
 default_executable: ey-deploy
 dependencies: []
 
@@ -33,6 +34,7 @@ files:
 - lib/ey-deploy/default_maintenance_page.html
 - lib/ey-deploy/deploy.rb
 - lib/ey-deploy/deploy_hook.rb
+- lib/ey-deploy/lockfile_parser.rb
 - lib/ey-deploy/logged_output.rb
 - lib/ey-deploy/server.rb
 - lib/ey-deploy/strategies/git.rb
@@ -230,6 +232,21 @@ files:
 - lib/vendor/thor/thor.gemspec
 - lib/vendor/thor/Thorfile
 - LICENSE
+- spec/custom_deploy_spec.rb
+- spec/deploy_hook_spec.rb
+- spec/fixtures/gitrepo/bar
+- 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
 licenses: []
@@ -240,29 +257,34 @@ 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
 test_files: 
 - spec/custom_deploy_spec.rb
 - spec/deploy_hook_spec.rb
+- spec/fixtures/gitrepo/bar
 - spec/fixtures/gitrepo/foo
 - spec/fixtures/gitrepo.tar.gz
 - spec/fixtures/invalid_hook.rb
@@ -273,5 +295,5 @@ test_files:
 - 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/1.0.0.rc.1-with-bundler
 - spec/support/lockfiles/not-a-lockfile

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

@@ -1,56 +0,0 @@
-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)