engineyard-serverside 1.3.6 → 1.3.7

data/lib/engineyard-serverside.rb

@@ -9,7 +9,6 @@ require 'escape'
 require 'json'
 require 'dataflow'
 
-require 'version'
 require 'strategies/git'
 require 'task'
 require 'server'

data/lib/engineyard-serverside/lockfile_parser.rb

@@ -5,14 +5,26 @@ module EY
     attr_reader :bundler_version, :lockfile_version
 
     def initialize(lockfile_contents)
-      @contents = lockfile_contents
-      @lockfile_version, @bundler_version = parse
+      @lockfile_version, @bundler_version = Parse106.new(lockfile_contents).parse
     end
 
     private
-    def parse
-      from_yaml = safe_yaml_load(@contents)
-      if from_yaml                        # 0.9
+
+    class BaseParser
+      def initialize(contents)
+        @contents = contents
+      end
+      def parse
+        raise "Unknown lockfile format #{@contents[0,50]}..."
+      end
+    end
+
+    class Parse09 < BaseParser
+      def parse
+        from_yaml = safe_yaml_load(@contents)
+        unless from_yaml.is_a?(Hash)
+          return super
+        end
         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}.
@@ -21,7 +33,19 @@ module EY
           end
         end.compact.first
         [:bundler09, bundler_version]
-      else                                # 1.0 or bust
+      end
+      def safe_yaml_load(loadable)
+        YAML.load(loadable) #won't always raise... soemtimes parses the contents as 1 big string
+      rescue ArgumentError => e  # not yaml
+        nil
+      end
+    end
+
+    class Parse10 < Parse09
+      def parse
+        unless @contents.index(/^DEPENDENCIES/)
+          return super
+        end
         dep_section = ""
         in_dependencies_section = false
         @contents.each_line do |line|
@@ -45,10 +69,32 @@ module EY
       end
     end
 
-    def safe_yaml_load(loadable)
-      YAML.load(loadable)
-    rescue ArgumentError   # not yaml
-      nil
+    class Parse106 < Parse10
+      def parse
+        unless @contents.index(/^METADATA/)
+          return super
+        end
+        meta_section = ""
+        in_meta_section = false
+        @contents.each_line do |line|
+          if line =~ /^METADATA/
+            in_meta_section = true
+          elsif line =~ /^\S/
+            in_meta_section = false
+          elsif in_meta_section
+            meta_section << line
+          end
+        end
+
+        unless meta_section.length > 0
+          raise "Couldn't parse #{@contents}; exiting"
+          exit(1)
+        end
+
+        result = meta_section.scan(/^\s*version:\s*(.*)$/).first
+        bundler_version = result ? result.first : nil
+        [:bundler10, bundler_version]
+      end
     end
 
   end

data/lib/engineyard-serverside/version.rb

@@ -1,3 +1,3 @@
 module EY
-  VERSION = '1.3.6'
+  VERSION = '1.3.7'
 end

data/spec/lockfile_parser_spec.rb

@@ -24,7 +24,27 @@ describe "the bundler version retrieved from the lockfile" do
     get_version('1.0.0.rc.1-with-bundler').should == '1.0.0.rc.1'
   end
 
+  it "gets the version from a 1.0.6 lockfile w/dependency on 1.0.6" do
+    # This is a real, customer-generated lockfile
+    get_version('1.0.6-with-bundler').should == '1.0.6'
+  end
+
+  it "gets the version from a 1.0.6 lockfile w/dependency on 1.0.6 (bundled ~> 1.0.0)" do
+    # This is a real, customer-generated lockfile
+    get_version('1.0.6-with-any-bundler').should == '1.0.6'
+  end
+
+  it "gets the version from a 1.0.6 lockfile w/o dependency" do
+    # This is a real, customer-generated lockfile
+    get_version('1.0.6-no-bundler').should == '1.0.6'
+  end
+
   it "raises an error if it can't parse the file" do
-    lambda { get_version('not-a-lockfile') }.should raise_error
+    lambda { get_version('not-a-lockfile') }.should raise_error(RuntimeError, /Unknown lockfile format/)
   end
+
+  it "raises an error if it can't parse evil yaml" do
+    lambda { get_version('evil-yaml') }.should raise_error(RuntimeError, /Unknown lockfile format/)
+  end
+
 end

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

@@ -0,0 +1,51 @@
+PATH
+  remote: .
+  specs:
+    fog (0.3.7)
+      builder
+      excon (>= 0.2.3)
+      formatador (>= 0.0.15)
+      json
+      mime-types
+      net-ssh (~> 2.0.23)
+      nokogiri (~> 1.4.3.1)
+      ruby-hmac
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    builder (2.1.2)
+    excon (0.2.3)
+    formatador (0.0.15)
+    gestalt (0.0.11)
+      formatador (>= 0.0.12)
+    json (1.4.6)
+    mime-types (1.16)
+    net-ssh (2.0.23)
+    nokogiri (1.4.3.1)
+    rake (0.8.7)
+    rspec (1.3.0)
+    ruby-hmac (0.4.0)
+    shindo (0.1.6)
+      formatador (>= 0.0.14)
+      gestalt (>= 0.0.11)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  builder
+  excon (>= 0.2.3)
+  fog!
+  formatador (>= 0.0.15)
+  json
+  mime-types
+  net-ssh (~> 2.0.23)
+  nokogiri (~> 1.4.3.1)
+  rake
+  rspec
+  ruby-hmac
+  shindo (= 0.1.6)
+
+METADATA
+  version: 1.0.6

data/spec/support/lockfiles/1.0.6-with-any-bundler

@@ -0,0 +1,52 @@
+PATH
+  remote: .
+  specs:
+    fog (0.3.7)
+      builder
+      excon (>= 0.2.3)
+      formatador (>= 0.0.15)
+      json
+      mime-types
+      net-ssh (~> 2.0.23)
+      nokogiri (~> 1.4.3.1)
+      ruby-hmac
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    builder (2.1.2)
+    excon (0.2.3)
+    formatador (0.0.15)
+    gestalt (0.0.11)
+      formatador (>= 0.0.12)
+    json (1.4.6)
+    mime-types (1.16)
+    net-ssh (2.0.23)
+    nokogiri (1.4.3.1)
+    rake (0.8.7)
+    rspec (1.3.0)
+    ruby-hmac (0.4.0)
+    shindo (0.1.6)
+      formatador (>= 0.0.14)
+      gestalt (>= 0.0.11)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  builder
+  bundler (~> 1.0.0)
+  excon (>= 0.2.3)
+  fog!
+  formatador (>= 0.0.15)
+  json
+  mime-types
+  net-ssh (~> 2.0.23)
+  nokogiri (~> 1.4.3.1)
+  rake
+  rspec
+  ruby-hmac
+  shindo (= 0.1.6)
+
+METADATA
+  version: 1.0.6

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

@@ -0,0 +1,52 @@
+PATH
+  remote: .
+  specs:
+    fog (0.3.7)
+      builder
+      excon (>= 0.2.3)
+      formatador (>= 0.0.15)
+      json
+      mime-types
+      net-ssh (~> 2.0.23)
+      nokogiri (~> 1.4.3.1)
+      ruby-hmac
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    builder (2.1.2)
+    excon (0.2.3)
+    formatador (0.0.15)
+    gestalt (0.0.11)
+      formatador (>= 0.0.12)
+    json (1.4.6)
+    mime-types (1.16)
+    net-ssh (2.0.23)
+    nokogiri (1.4.3.1)
+    rake (0.8.7)
+    rspec (1.3.0)
+    ruby-hmac (0.4.0)
+    shindo (0.1.6)
+      formatador (>= 0.0.14)
+      gestalt (>= 0.0.11)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  builder
+  bundler (= 1.0.6)
+  excon (>= 0.2.3)
+  fog!
+  formatador (>= 0.0.15)
+  json
+  mime-types
+  net-ssh (~> 2.0.23)
+  nokogiri (~> 1.4.3.1)
+  rake
+  rspec
+  ruby-hmac
+  shindo (= 0.1.6)
+
+METADATA
+  version: 1.0.6

data/spec/support/lockfiles/evil-yaml

@@ -0,0 +1,5 @@
+--- 
+x: |-
+  
+   x
+  x

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: engineyard-serverside
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 1
   - 3
-  - 6
-  version: 1.3.6
+  - 7
+  version: 1.3.7
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-08 00:00:00 -08:00
+date: 2010-11-17 00:00:00 -08:00
 default_executable: engineyard-serverside
 dependencies: []
 
@@ -235,6 +235,7 @@ files:
 - 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
@@ -248,6 +249,10 @@ files:
 - 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/1.0.6-no-bundler
+- spec/support/lockfiles/1.0.6-with-any-bundler
+- spec/support/lockfiles/1.0.6-with-bundler
+- spec/support/lockfiles/evil-yaml
 - spec/support/lockfiles/not-a-lockfile
 has_rdoc: true
 homepage: http://github.com/engineyard/engineyard-serverside
@@ -286,6 +291,7 @@ 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/foo
 - spec/fixtures/gitrepo.tar.gz
 - spec/fixtures/invalid_hook.rb
 - spec/fixtures/valid_hook.rb
@@ -299,4 +305,8 @@ test_files:
 - 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/1.0.6-no-bundler
+- spec/support/lockfiles/1.0.6-with-any-bundler
+- spec/support/lockfiles/1.0.6-with-bundler
+- spec/support/lockfiles/evil-yaml
 - spec/support/lockfiles/not-a-lockfile