engineyard-serverside 1.4.1 → 1.4.3.nodestack

data/lib/engineyard-serverside/configuration.rb

@@ -119,7 +119,7 @@ module EY
       end
 
       def framework_envs
-        "RAILS_ENV=#{environment} RACK_ENV=#{environment} MERB_ENV=#{environment}"
+        "RAILS_ENV=#{environment} RACK_ENV=#{environment} APP_ENV=#{environment} MERB_ENV=#{environment}"
       end
 
       def current_path

data/lib/engineyard-serverside/deploy.rb

@@ -142,7 +142,36 @@ module EY
 
           sudo "#{$0} _#{EY::Serverside::VERSION}_ install_bundler #{bundler_installer.version}"
 
+          bundled_gems_path = File.join(c.shared_path, "bundled_gems")
+          ruby_version_file = File.join(bundled_gems_path, "RUBY_VERSION")
+          system_version_file = File.join(bundled_gems_path, "SYSTEM_VERSION")
+          ruby_version = `ruby -v`
+          system_version = `uname -m`
+
+          if File.directory?(bundled_gems_path)
+            rebundle = false
+
+            rebundle = true if File.exist?(ruby_version_file) && File.read(ruby_version_file) != ruby_version
+            rebundle = true if File.exist?(system_version_file) && File.read(system_version_file) != system_version
+
+            if rebundle
+              info "~> Ruby version change detected, cleaning bundled gems"
+              run "rm -Rf #{bundled_gems_path}"
+            end
+          end
+
           run "cd #{c.release_path} && bundle _#{bundler_installer.version}_ install #{bundler_installer.options}"
+
+          run "mkdir -p #{bundled_gems_path} && ruby -v > #{ruby_version_file} && uname -m > #{system_version_file}"
+        end
+        if File.exist?("#{c.release_path}/package.json")
+          unless `which npm` =~ /npm/
+            error "~> package.json detected, BUT npm not installed"
+          else
+            info "~> package.json detected, installing npm packages"
+          
+            run "cd #{c.release_path} && npm install"
+          end
         end
       end
 
@@ -308,9 +337,9 @@ module EY
         parser = LockfileParser.new(File.read(lockfile))
         case parser.lockfile_version
         when :bundler09
-          bundler_09_installer(parser.bundler_version || default_09_bundler)
+          bundler_09_installer(parser.bundler_version)
         when :bundler10
-          bundler_10_installer(parser.bundler_version || default_10_bundler)
+          bundler_10_installer(parser.bundler_version)
         else
           raise "Unknown lockfile version #{parser.lockfile_version}"
         end
@@ -325,10 +354,6 @@ module EY
         BundleInstaller.new(version,
           "--deployment --path #{c.shared_path}/bundled_gems --binstubs #{c.binstubs_path} --without development test")
       end
-
-      def default_09_bundler() "0.9.26" end
-      def default_10_bundler() "1.0.10" end
-
     end   # DeployBase
 
     class Deploy < DeployBase

data/lib/engineyard-serverside/lockfile_parser.rb

@@ -9,8 +9,6 @@ module EY
         @lockfile_version, @bundler_version = Parse106.new(lockfile_contents).parse
       end
 
-      private
-
       class BaseParser
         def initialize(contents)
           @contents = contents
@@ -21,6 +19,8 @@ module EY
       end
 
       class Parse09 < BaseParser
+        DEFAULT = "0.9.26"
+
         def parse
           from_yaml = safe_yaml_load(@contents)
           unless from_yaml.is_a?(Hash)
@@ -33,7 +33,7 @@ module EY
               spec.values.first["version"]
             end
           end.compact.first
-          [:bundler09, bundler_version]
+          [:bundler09, bundler_version || DEFAULT]
         end
         def safe_yaml_load(loadable)
           YAML.load(loadable) #won't always raise... soemtimes parses the contents as 1 big string
@@ -43,6 +43,8 @@ module EY
       end
 
       class Parse10 < Parse09
+        DEFAULT = "1.0.10"
+
         def parse
           unless @contents.index(/^DEPENDENCIES/)
             return super
@@ -64,9 +66,29 @@ module EY
             exit(1)
           end
 
-          result = dep_section.scan(/^\s*bundler\s*\(=\s*([^\)]+)\)/).first
-          bundler_version = result ? result.first : nil
-          [:bundler10, bundler_version]
+          result = scan_bundler(dep_section)
+          bundler_version = result ? result.last : nil
+          version_qualifier = result ? result.first : nil
+          [:bundler10, fetch_version(bundler_version, version_qualifier)]
+        end
+
+        def fetch_version(bundler_version, version_qualifier)
+          return bundler_version || DEFAULT unless version_qualifier
+
+          case version_qualifier
+          when '='
+            bundler_version
+          when '>='
+            Gem::Version.new(bundler_version) > Gem::Version.new(DEFAULT) ? bundler_version : DEFAULT
+          when '~>'
+            bundler_gem_version = Gem::Version.new(bundler_version)
+            recommendation = bundler_gem_version.spermy_recommendation.gsub(/~>\s*(.+)$/, '\1.')
+            DEFAULT.start_with?(recommendation) && Gem::Version.new(DEFAULT) > bundler_gem_version ? DEFAULT : bundler_version
+          end
+        end
+
+        def scan_bundler(dep_section)
+          dep_section.scan(/^\s*bundler\s*\((>?=|~>)\s*([^,\)]+)/).first
         end
       end
 
@@ -93,7 +115,7 @@ module EY
           end
 
           result = meta_section.scan(/^\s*version:\s*(.*)$/).first
-          bundler_version = result ? result.first : nil
+          bundler_version = result ? result.first : DEFAULT
           [:bundler10, bundler_version]
         end
       end

data/lib/engineyard-serverside/logged_output.rb

@@ -41,6 +41,11 @@ module EY
         EY::Serverside::LoggedOutput.verbose?
       end
 
+      # TODO color output
+      def error(msg)
+        info(msg)
+      end
+
       def info(msg)
         with_logfile do |log|
           Tee.new($stdout, log) << (msg + "\n")

data/lib/engineyard-serverside/version.rb

@@ -1,5 +1,5 @@
 module EY
   module Serverside
-    VERSION = '1.4.1'
+    VERSION = '1.4.3.nodestack'
   end
 end

data/spec/lockfile_parser_spec.rb

@@ -1,14 +1,16 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
 describe "the bundler version retrieved from the lockfile" do
+  def get_full_path(file)
+    File.expand_path("../support/lockfiles/#{file}", __FILE__)
+  end
   def get_version(file)
-    full_path = File.expand_path("../support/lockfiles/#{file}", __FILE__)
     @config = EY::Serverside::Deploy::Configuration.new('deploy_to' => 'dontcare')
-    EY::Serverside::DeployBase.new(@config).get_bundler_installer(full_path).version
+    EY::Serverside::DeployBase.new(@config).get_bundler_installer(get_full_path(file)).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::Serverside::DeployBase.new(@config).send(:default_09_bundler)
+    get_version('0.9-no-bundler').should == EY::Serverside::LockfileParser::Parse09::DEFAULT
   end
 
   it "gets the version from an 0.9 lockfile with a bundler dependency" do
@@ -16,7 +18,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::Serverside::DeployBase.new(@config).send(:default_10_bundler)
+    get_version('1.0-no-bundler').should == EY::Serverside::LockfileParser::Parse10::DEFAULT
   end
 
   it "gets the version from a 1.0.0.rc.1 lockfile w/dependency on 1.0.0.rc.1" do
@@ -47,4 +49,36 @@ describe "the bundler version retrieved from the lockfile" do
     lambda { get_version('evil-yaml') }.should raise_error(RuntimeError, /Unknown lockfile format/)
   end
 
+  context "fetching the right version number" do
+    subject { EY::Serverside::LockfileParser::Parse10.new(get_full_path('1.0.6-no-bundler')) }
+
+    it "uses the default version when there is no bundler version" do
+      subject.fetch_version(nil, nil).should == EY::Serverside::LockfileParser::Parse10::DEFAULT
+    end
+
+    it "uses the given version when the qualifier is `='" do
+      subject.fetch_version('1.0.1', '=').should == '1.0.1'
+    end
+
+    it "uses the default version when we get a pessimistic qualifier and is lower than the default version" do
+      subject.fetch_version('1.0.1', '~>').should == '1.0.10'
+    end
+
+    it "uses the given version when we get a pessimistic qualifier that doesn't match the default version" do
+      subject.fetch_version('1.1.0', '~>').should == '1.1.0'
+    end
+
+    it "uses the given version when it's geater of equal than the default version" do
+      subject.fetch_version('1.1.0', '>=').should == '1.1.0'
+    end
+
+    it "uses the default version when the given version is lower" do
+      subject.fetch_version('1.0.1', '>=').should == EY::Serverside::LockfileParser::Parse10::DEFAULT
+    end
+
+    it "selects only the first version expression" do
+      scan = subject.scan_bundler 'bundler (>=1.0.1, <2.0.0)'
+      scan.last.should == '1.0.1'
+    end
+  end
 end

data/spec/real_deploy_spec.rb

@@ -46,6 +46,21 @@ DEPENDENCIES
   rake
 EOF
         end
+
+        File.open('package.json', 'w') do |f|
+          f.write <<-EOF
+{
+    "name": "application-name"
+  , "version": "0.0.1"
+  , "private": true
+  , "dependencies": {
+      "express": "2.3.12"
+    , "jade": ">= 0.0.1"
+  }
+}
+EOF
+        end
+
       end
     end
 
@@ -149,6 +164,12 @@ describe "deploying an application" do
         'framework_env' => 'staging'
       })
 
+    # pretend there is a shared bundled_gems directory
+    FileUtils.mkdir_p(File.join(@deploy_dir, 'shared', 'bundled_gems'))
+    %w(RUBY_VERSION SYSTEM_VERSION).each do |name| 
+      File.open(File.join(@deploy_dir, 'shared', 'bundled_gems', name), "w") { |f| f.write("old\n") }
+    end
+
     @binpath = $0 = File.expand_path(File.join(File.dirname(__FILE__), '..', 'bin', 'engineyard-serverside'))
     @deployer = FullTestDeploy.new(config)
     @deployer.deploy
@@ -174,6 +195,29 @@ describe "deploying an application" do
     bundle_install_cmd.should include('--deployment')
   end
 
+  it "creates a ruby version file" do
+    File.exist?(File.join(@deploy_dir, 'shared', 'bundled_gems', 'RUBY_VERSION')).should be_true
+  end
+
+  it "creates a system version file" do
+    File.exist?(File.join(@deploy_dir, 'shared', 'bundled_gems', 'SYSTEM_VERSION')).should be_true
+  end
+
+  it "removes bundled_gems directory if the ruby version changed" do
+    clear_bundle_cmd = @deployer.commands.grep(/rm -Rf \S+\/bundled_gems/).first
+    clear_bundle_cmd.should_not be_nil
+  end
+
+  it "removes bundled_gems directory if the system version changed" do
+    clear_bundle_cmd = @deployer.commands.grep(/rm -Rf \S+\/bundled_gems/).first
+    clear_bundle_cmd.should_not be_nil
+  end
+
+  it "runs 'npm install'" do
+    bundle_install_cmd = @deployer.commands.grep(/npm install/).first
+    bundle_install_cmd.should_not be_nil
+  end
+
   it "creates binstubs somewhere out of the way" do
     File.exist?(File.join(@deploy_dir, 'current', 'ey_bundler_binstubs', 'rake')).should be_true
   end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: engineyard-serverside
 version: !ruby/object:Gem::Version 
-  hash: 5
-  prerelease: 
+  hash: -1757219187
+  prerelease: 6
   segments: 
   - 1
   - 4
-  - 1
-  version: 1.4.1
+  - 3
+  - nodestack
+  version: 1.4.3.nodestack
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -15,8 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-17 00:00:00 -08:00
-default_executable: engineyard-serverside
+date: 2011-08-31 00:00:00 Z
 dependencies: []
 
 description: 
@@ -237,6 +237,7 @@ files:
 - spec/custom_deploy_spec.rb
 - spec/deploy_hook_spec.rb
 - spec/deprecation_spec.rb
+- spec/fixtures/gitrepo/bar
 - spec/fixtures/gitrepo/foo
 - spec/fixtures/gitrepo.tar.gz
 - spec/fixtures/invalid_hook.rb
@@ -256,7 +257,6 @@ files:
 - 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
 licenses: []
 
@@ -277,16 +277,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: A gem that deploys ruby applications on EY Cloud instances
@@ -294,6 +296,7 @@ test_files:
 - spec/custom_deploy_spec.rb
 - spec/deploy_hook_spec.rb
 - spec/deprecation_spec.rb
+- spec/fixtures/gitrepo/bar
 - spec/fixtures/gitrepo/foo
 - spec/fixtures/gitrepo.tar.gz
 - spec/fixtures/invalid_hook.rb