engineyard-serverside 1.5.23.ruby19.13 → 1.5.23.ruby19.14

data/lib/engineyard-serverside.rb

@@ -23,7 +23,6 @@ require 'engineyard-serverside/configuration'
 require 'engineyard-serverside/deprecation'
 require 'engineyard-serverside/future'
 
-$DEBUG = false
 module EY
   module Serverside
     RemoteFailure = Class.new StandardError
@@ -57,7 +56,8 @@ module EY
 
     def self.read_encoded_dna
       encoded_dna = '{}'
-      force_unicode = encoded_dna.respond_to?(:force_encoding) || ($KCODE = 'U' && false)
+      force_unicode = encoded_dna.respond_to?(:force_encoding)
+      $KCODE = 'U' unless force_unicode
 
       if File.exist?(dna_path)
         encoded_dna = `sudo cat #{dna_path}`

data/lib/engineyard-serverside/cli.rb

@@ -187,16 +187,22 @@ module EY
         EY::Serverside::Deploy.new(config).restart_with_maintenance_page
       end
 
-       desc "install_bundler [VERSION]", "Make sure VERSION of bundler is installed (in system ruby)"
+      desc "install_bundler [VERSION]", "Make sure VERSION of bundler is installed (in system ruby)"
       def install_bundler(version)
-        has_bundler_cmd = "gem list -i bundler -v '#{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 engineyard-serverside gem to the other instances in the cluster. This will install exactly version #{EY::Serverside::VERSION}."
+      desc "propagate", "Propagate the engineyard-serverside gem to the other instances in the cluster. This will install exactly version #{EY::Serverside::VERSION}."
       def propagate
         ey_server_side = Dependency.new('engineyard-serverside', EY::Serverside::VERSION)
         servers = EY::Serverside::Server.all.find_all { |server| !server.local? }

data/lib/engineyard-serverside/deploy.rb

@@ -167,7 +167,7 @@ To fix this problem, commit your Gemfile.lock to your repository and redeploy.
 
       # GIT_SSH needs to be defined in the environment for customers with private bundler repos in their Gemfile.
       def clean_environment
-        %Q[export GIT_SSH="#{ssh_executable}" && export LANG="en_US.UTF-8" && unset BUNDLE_PATH BUNDLE_FROZEN BUNDLE_WITHOUT BUNDLE_BIN BUNDLE_GEMFILE]
+        %Q[export GIT_SSH="#{ssh_executable}" && export LANG="en_US.UTF-8" && unset RUBYOPT BUNDLE_PATH BUNDLE_FROZEN BUNDLE_WITHOUT BUNDLE_BIN BUNDLE_GEMFILE]
       end
 
       # If we don't have a local version of the ssh wrapper script yet,
@@ -426,10 +426,7 @@ Deploy again if your services configuration appears incomplete or out of date.
           clean_bundle_on_system_version_change
 
           bundler_version, install_switches = bundler_config
-          installed = run "gem list -i bundler -v '#{bundler_version}'" rescue false
-          unless installed
-            sudo "gem install bundler -q --no-rdoc --no-ri -v '#{bundler_version}'"
-          end
+          sudo "#{clean_environment} && #{serverside_bin} install_bundler #{bundler_version}"
           run  "#{clean_environment} && cd #{c.release_path} && ruby -S bundle _#{bundler_version}_ install #{install_switches}"
 
           write_system_version

data/lib/engineyard-serverside/future.rb

@@ -18,10 +18,6 @@ module EY
       def error?
         !success?
       end
-
-      def inspect
-        %Q{<Serverside::Future @server="#{@server.hostname}" @args="#{@args}" @value="#{@value}"}
-      end
     end
 
     if RUBY_VERSION =~ /1\.8/

data/lib/engineyard-serverside/futures/dataflow.rb

@@ -4,17 +4,23 @@ module EY
     require 'dataflow'
 
     class Future
+      extend Dataflow
+
       def self.call(servers, *args, &block)
-        futures = barrier(*servers.map do |server|
-          new(server, *args, &block)
+        futures = []
+        # Dataflow needs to call `barrier` and `need_later` in the same object
+        barrier(*servers.map do |server|
+          future = new(server, *args, &block)
+          futures << future
+
+          need_later { future.call }
         end)
 
-        futures.each {|f| f.call}
         futures
       end
 
       def future
-        need_later { @block.call(@server, *@args) }
+        @block.call(@server, *@args)
       end
 
       def call

data/lib/engineyard-serverside/lockfile_parser.rb

@@ -16,9 +16,15 @@ module EY
       end
 
       def any_database_adapter?
-        %w[mysql2 mysql do_mysql pg do_postgres].any? do |gem|
-          @contents.index(/^\s+#{gem}\s\([^\)]+\)$/)
+        any_ruby_adapter = %w[mysql2 mysql do_mysql pg do_postgres sqlite3].any? do |type|
+          @contents.index(/^\s+#{type}\s\([^\)]+\)$/)
         end
+
+        any_jruby_adapter = %w[mysql postgresql sqlite3].any? do |type|
+          @contents.index(/^\s+jdbc-#{type}\s\([^\)]+\)$/) || @contents.index(/^\s+activerecord-jdbc#{type}-adapter\s\([^\)]+\)$/)
+        end
+
+        any_ruby_adapter || any_jruby_adapter
       end
 
       def parse

data/lib/engineyard-serverside/version.rb

@@ -1,5 +1,5 @@
 module EY
   module Serverside
-    VERSION = '1.5.23.ruby19.13'
+    VERSION = '1.5.23.ruby19.14'
   end
 end

metadata

@@ -1,35 +1,23 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: engineyard-serverside
-version: !ruby/object:Gem::Version 
-  hash: -966683994
+version: !ruby/object:Gem::Version
+  version: 1.5.23.ruby19.14
   prerelease: 7
-  segments: 
-  - 1
-  - 5
-  - 23
-  - ruby
-  - 19
-  - 13
-  version: 1.5.23.ruby19.13
 platform: ruby
-authors: 
+authors:
 - EY Cloud Team
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-10 00:00:00 Z
+date: 2012-01-10 00:00:00.000000000 Z
 dependencies: []
-
 description: 
 email: cloud@engineyard.com
-executables: 
+executables:
 - engineyard-serverside
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - bin/engineyard-serverside
 - lib/engineyard-serverside/cli.rb
 - lib/engineyard-serverside/configuration.rb
@@ -159,40 +147,29 @@ files:
 - spec/support/integration.rb
 homepage: http://github.com/engineyard/engineyard-serverside
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+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 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: 1.3.6
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A gem that deploys ruby applications on EY Cloud instances
-test_files: 
+test_files:
 - spec/basic_deploy_spec.rb
 - spec/bundler_deploy_spec.rb
 - spec/custom_deploy_spec.rb
@@ -224,3 +201,4 @@ test_files:
 - spec/services_deploy_spec.rb
 - spec/spec_helper.rb
 - spec/support/integration.rb
+has_rdoc: