engineyard-serverside 1.5.21 → 1.5.23.ruby19

data/lib/engineyard-serverside/cli.rb

@@ -1,16 +1,8 @@
-require 'thor'
 require 'pathname'
 
 module EY
   module Serverside
     class CLI < Thor
-      include Dataflow
-
-      def self.start(*)
-        super
-      rescue RemoteFailure
-        exit(1)
-      end
 
       method_option :migrate,         :type     => :string,
                                       :desc     => "Run migrations with this deploy",
@@ -56,14 +48,14 @@ module EY
                                       :aliases  => ["-v"]
 
       desc "deploy", "Deploy code from /data/<app>"
-      def deploy(default_task=:deploy)
+      def deploy(default_task = :deploy)
         config = EY::Serverside::Deploy::Configuration.new(options)
         EY::Serverside::Server.load_all_from_array(assemble_instance_hashes(config))
 
         EY::Serverside::LoggedOutput.verbose = options[:verbose]
         EY::Serverside::LoggedOutput.logfile = File.join(ENV['HOME'], "#{options[:app]}-deploy.log")
 
-        invoke :propagate
+        propagate
 
         EY::Serverside::Deploy.new(config).send(default_task)
       end
@@ -144,7 +136,7 @@ module EY
 
         EY::Serverside::Server.load_all_from_array(assemble_instance_hashes(config))
 
-        invoke :propagate
+        propagate
 
         EY::Serverside::Server.all.each do |server|
           server.sync_directory app_dir
@@ -190,56 +182,39 @@ module EY
         config = EY::Serverside::Deploy::Configuration.new(options)
         EY::Serverside::Server.load_all_from_array(assemble_instance_hashes(config))
 
-        invoke :propagate
+        propagate
 
         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)
-        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}[,)]'"
+        has_bundler_cmd = "gem list -i bundler -v '#{verison}'"
 
         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
-        config          = EY::Serverside::Deploy::Configuration.new
-        gem_filename    = "engineyard-serverside-#{EY::Serverside::VERSION}.gem"
-        local_gem_file  = File.join(Gem.dir, 'cache', gem_filename)
-        remote_gem_file = File.join(Dir.tmpdir, gem_filename)
-        gem_binary      = File.join(Gem.default_bindir, 'gem')
-
-        barrier(*(EY::Serverside::Server.all.find_all do |server|
+        ey_server_side = Dependency.new('engineyard-serverside', EY::Serverside::VERSION)
+        futures = EY::Serverside::Server.all.find_all do |server|
           !server.local?            # of course this machine has it
         end.map do |server|
-          need_later do
-            egrep_escaped_version = EY::Serverside::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 engineyard-serverside | grep \"engineyard-serverside\" | egrep -q '#{egrep_escaped_version}[,)]'"
-
-            if !server.run(has_gem_cmd)  # doesn't have this exact version
-              puts "~> Installing engineyard-serverside on #{server.hostname}"
-
-              system(Escape.shell_command([
-                'scp', '-i', "#{ENV['HOME']}/.ssh/internal",
-                "-o", "StrictHostKeyChecking=no",
-                local_gem_file,
-               "#{config.user}@#{server.hostname}:#{remote_gem_file}",
-              ]))
-              server.run("sudo #{gem_binary} install --no-rdoc --no-ri '#{remote_gem_file}'")
+          Celluloid::Future.new do
+            unless server.gem?(ey_server_side.name, ey_server_side.version)
+              (dependencies + [ey_server_side]).each do |dependency|
+                unless server.gem?(dependency.name, dependency.version)
+                  puts "~> Installing #{dependency.name} on #{server.hostname}"
+                  server.copy(dependency.local_path, dependency.remote_path)
+                  server.install_gem(dependency.remote_path)
+                end
+              end
             end
           end
-        end))
+        end
+        futures.all?{|x| x.value == true } || raise(EY::Serverside::RemoteFailure.new("Error installing engineyard-serverside dependencies"))
       end
 
       private
@@ -253,6 +228,25 @@ module EY
           }
         }
       end
+
+      def dependencies
+        [Dependency.new('hashie', Hashie::VERSION),
+         Dependency.new('celluloid', Celluloid::VERSION),
+         Dependency.new('posix-spawn', POSIX::Spawn::VERSION),
+         Dependency.new('thor', '0.13.3')]
+      end
+
+      class Dependency
+        attr_reader :name, :version
+        def initialize(name, version)
+          @name = name
+          @version = version
+        end
+
+        def gemname; "#{name}-#{version}.gem"; end
+        def local_path; File.expand_path(File.join('cache', gemname), Gem.dir); end
+        def remote_path; File.expand_path(gemname, Dir.tmpdir); end
+      end
     end
   end
 end

data/lib/engineyard-serverside/configuration.rb

@@ -1,13 +1,37 @@
-require 'json'
-require 'thor'
 
 module EY
   module Serverside
+    # Really simple and hacked implementation that works for the 99.9999% of the cases
+    class HashWithIndifferentAccess
+      def initialize(hash = {})
+        @internal = {}
+        hash.each do |k, v|
+          @internal[k.to_s] = v
+        end
+      end
+      def [](name)
+        @internal[name.to_s]
+      end
+      def []=(name, value)
+        @internal[name.to_s] = value
+      end
+
+      def method_missing(method, *args, &block)
+        if @internal.key?(method.to_s)
+          @internal[method.to_s]
+        else
+          @internal.send(method, args, &block)
+        end
+      end
+    end
+
     class Deploy::Configuration
-      DEFAULT_CONFIG = Thor::CoreExt::HashWithIndifferentAccess.new({
+      require 'json'
+
+      DEFAULT_CONFIG = Hashie::Mash.new({
         "branch"         => "master",
         "strategy"       => "Git",
-        "bundle_without" => "test development",
+        "bundle_without" => "test development"
       })
 
       attr_reader :configuration

data/lib/engineyard-serverside/deploy.rb

@@ -145,9 +145,10 @@ To fix this problem, commit your Gemfile.lock to your repository and redeploy.
       # task
       def push_code
         info "~> Pushing code to all servers"
-        barrier *(EY::Serverside::Server.all.map do |server|
-          need_later { server.sync_directory(config.repository_cache) }
-        end)
+        futures = EY::Serverside::Server.all.map do |server|
+          Celluloid:: Future.new { server.sync_directory(config.repository_cache) }
+        end
+        futures.all? {|f| f.value == true}
       end
 
       # task
@@ -161,7 +162,7 @@ To fix this problem, commit your Gemfile.lock to your repository and redeploy.
       end
 
       def restart_command
-        "/engineyard/bin/app_#{c.app} deploy"
+        %{LANG="en_US.UTF-8" /engineyard/bin/app_#{c.app} deploy}
       end
 
       # GIT_SSH needs to be defined in the environment for customers with private bundler repos in their Gemfile.

data/lib/engineyard-serverside/logged_output.rb

@@ -1,5 +1,3 @@
-require 'open4'
-
 module EY
   module Serverside
     module LoggedOutput
@@ -64,9 +62,9 @@ module EY
 
           out <<  ":: running #{cmd}\n"
 
-          # :quiet means don't raise an error on nonzero exit status
-          status = Open4.spawn cmd, 0 => '', 1 => out, 2 => err, :quiet => true
-          status.exitstatus == 0
+          pid = POSIX::Spawn::spawn(cmd, :out => out, :err => err)
+          status = Process::waitpid(pid)
+          status.success?
         end
       end
 

data/lib/engineyard-serverside/server.rb

@@ -83,12 +83,36 @@ module EY
         if local?
           logged_system(command)
         else
-          logged_system(ssh_command + " " + Escape.shell_command(["#{user}@#{hostname}", command]))
+          logged_system(ssh_command + Escape.shell_command(["#{user}@#{hostname}", command]))
         end
       end
 
+      def copy(local_file, remote_file)
+        logged_system(scp_command + Escape.shell_command([local_file, "#{user}@#{hostname}:#{remote_file}"]))
+      end
+
       def ssh_command
-        "ssh -i #{ENV['HOME']}/.ssh/internal -o StrictHostKeyChecking=no -o PasswordAuthentication=no"
+        "ssh #{ssh_options} "
+      end
+
+      def scp_command
+        "scp #{ssh_options} "
+      end
+
+      def ssh_options
+        "-i #{ENV['HOME']}/.ssh/internal -o StrictHostKeyChecking=no -o PasswordAuthentication=no"
+      end
+
+      def gem?(name, version)
+        run("#{gem_command} list -i #{name} -v '#{version}'")
+      end
+
+      def install_gem(path)
+        run("#{gem_command} install --no-ri --no-rdoc #{path}")
+      end
+
+      def gem_command
+        File.expand_path('gem', Gem.default_bindir)
       end
 
     end

data/lib/engineyard-serverside/task.rb

@@ -1,7 +1,6 @@
 module EY
   module Serverside
     class Task
-      include Dataflow
 
       attr_reader :config
       alias :c :config
@@ -51,13 +50,12 @@ module EY
       def run_on_roles(cmd, wrapper=%w[sh -l -c])
         results = EY::Serverside::Server.from_roles(@roles).map do |server|
           to_run = block_given? ? yield(server, cmd.dup) : cmd
-          need_later { server.run(Escape.shell_command(wrapper + [to_run])) }
+          Celluloid::Future.new { server.run(Escape.shell_command(wrapper + [to_run])) }
         end
-        barrier *results
         # MRI's truthiness check is an internal C thing that does not call
         # any methods... so Dataflow cannot proxy it & we must "x == true"
         # Rubinius, wherefore art thou!?
-        results.all?{|x| x == true } || raise(EY::Serverside::RemoteFailure.new(cmd))
+        results.all?{|x| x.value == true } || raise(EY::Serverside::RemoteFailure.new(cmd))
       end
 
     end

data/lib/engineyard-serverside/version.rb

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

data/lib/engineyard-serverside.rb

@@ -1,21 +1,15 @@
-if String.instance_methods.include?(:force_encoding)
-  $string_encodings = true
-else
-  # KCODE is gone in 1.9-like implementations, but we
-  # still need to set it for 1.8.
-  $KCODE = 'U'
-  $string_encodings = false
-end
+# encoding: utf-8
 
-$LOAD_PATH.unshift File.expand_path('vendor/thor/lib', File.dirname(__FILE__))
-$LOAD_PATH.unshift File.expand_path('vendor/open4/lib', File.dirname(__FILE__))
 $LOAD_PATH.unshift File.expand_path('vendor/escape/lib', File.dirname(__FILE__))
 $LOAD_PATH.unshift File.expand_path('vendor/json_pure/lib', File.dirname(__FILE__))
-$LOAD_PATH.unshift File.expand_path('vendor/dataflow', File.dirname(__FILE__))
 
 require 'escape'
 require 'json'
-require 'dataflow'
+require 'posix/spawn'
+require 'tmpdir'
+require 'celluloid'
+require 'hashie/mash'
+require 'hashie/version'
 
 require 'engineyard-serverside/version'
 require 'engineyard-serverside/strategies/git'
@@ -43,7 +37,7 @@ module EY
     private # doesn't work how people think, but hey..
     def self.deep_indifferentize(thing)
       if thing.kind_of?(Hash)
-        indifferent_hash = Thor::CoreExt::HashWithIndifferentAccess.new
+        indifferent_hash = Hashie::Mash.new
         thing.each do |k, v|
           indifferent_hash[k] = deep_indifferentize(v)
         end
@@ -60,13 +54,7 @@ module EY
     end
 
     def self.read_encoded_dna
-      json = if File.exist?(dna_path)
-               `sudo cat #{dna_path}`
-             else
-               '{}'
-             end
-      json.force_encoding('UTF-8') if $string_encodings
-      json
+      File.exist?(dna_path) ? File.read(dna_path) : '{}'
     end
   end
 end

data/spec/basic_deploy_spec.rb

@@ -4,7 +4,7 @@ describe "Deploying an application without Bundler" do
   before(:all) do
     $DISABLE_GEMFILE = true # Don't generate Gemfile/Gemfile.lock
     $DISABLE_LOCKFILE = true
-    @deploy_dir = Pathname.new(Dir.tmpdir).join("serverside-deploy-#{Time.now.to_i}-#{$$}")
+    @deploy_dir = Pathname.new(Dir.mktmpdir("serverside-deploy-#{Time.now.to_i}-#{$$}"))
 
     # set up EY::Serverside::Server like we're on a solo
     EY::Serverside::Server.reset

data/spec/bundler_deploy_spec.rb

@@ -7,7 +7,7 @@ describe "Deploying an application that uses Bundler" do
   end
 
   def deploy_test_application
-    @deploy_dir = File.join(Dir.tmpdir, "serverside-deploy-#{Time.now.to_i}-#{$$}")
+    @deploy_dir = Dir.mktmpdir("serverside-deploy-#{Time.now.to_i}-#{$$}")
 
     # set up EY::Serverside::Server like we're on a solo
     EY::Serverside::Server.reset

data/spec/nodejs_deploy_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe "Deploying an application that uses Node.js and NPM" do
   def deploy_test_application
-    @deploy_dir = File.join(Dir.tmpdir, "serverside-deploy-#{Time.now.to_i}-#{$$}")
+    @deploy_dir = Dir.mktmpdir( "serverside-deploy-#{Time.now.to_i}-#{$$}")
 
     # set up EY::Serverside::Server like we're on a solo
     EY::Serverside::Server.reset

data/spec/rails31_deploy_spec.rb

@@ -4,7 +4,7 @@ describe "Deploying a Rails 3.1 application" do
   def deploy_test_application(assets_enabled = true, &block)
     $DISABLE_GEMFILE = false
     $DISABLE_LOCKFILE = false
-    @deploy_dir = File.join(Dir.tmpdir, "serverside-deploy-#{Time.now.to_i}-#{$$}")
+    @deploy_dir = Dir.mktmpdir("serverside-deploy-#{Time.now.to_i}-#{$$}")
 
     # set up EY::Serverside::Server like we're on a solo
     EY::Serverside::Server.reset

data/spec/services_deploy_spec.rb

@@ -4,7 +4,7 @@ describe "Deploying an application with services" do
   before(:each) do
     #$DISABLE_GEMFILE = true # Don't generate Gemfile/Gemfile.lock
     #$DISABLE_LOCKFILE = true
-    @deploy_dir = Pathname.new(Dir.tmpdir).join("serverside-deploy-#{Time.now.to_i}-#{$$}")
+    @deploy_dir = Pathname.new(Dir.mktmpdir("serverside-deploy-#{Time.now.to_i}-#{$$}"))
 
     # set up EY::Serverside::Server like we're on a solo
     EY::Serverside::Server.reset