engineyard-serverside 1.5.23.ruby19.16 → 1.5.24

data/lib/engineyard-serverside.rb

@@ -1,15 +1,21 @@
-# encoding: utf-8
+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
 
+$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/open4/lib', File.dirname(__FILE__))
-$LOAD_PATH.unshift File.expand_path('vendor/thor/lib', File.dirname(__FILE__))
+$LOAD_PATH.unshift File.expand_path('vendor/dataflow', File.dirname(__FILE__))
 
 require 'escape'
 require 'json'
-require 'tmpdir'
-require 'thor'
-require 'open4'
+require 'dataflow'
 
 require 'engineyard-serverside/version'
 require 'engineyard-serverside/strategies/git'
@@ -21,7 +27,6 @@ require 'engineyard-serverside/lockfile_parser'
 require 'engineyard-serverside/cli'
 require 'engineyard-serverside/configuration'
 require 'engineyard-serverside/deprecation'
-require 'engineyard-serverside/future'
 
 module EY
   module Serverside
@@ -55,16 +60,13 @@ module EY
     end
 
     def self.read_encoded_dna
-      encoded_dna = '{}'
-      force_unicode = encoded_dna.respond_to?(:force_encoding)
-      $KCODE = 'U' unless force_unicode
-
-      if File.exist?(dna_path)
-        encoded_dna = `sudo cat #{dna_path}`
-        encoded_dna.force_encoding('UTF-8') if force_unicode
-      end
-
-      encoded_dna
+      json = if File.exist?(dna_path)
+               `sudo cat #{dna_path}`
+             else
+               '{}'
+             end
+      json.force_encoding('UTF-8') if $string_encodings
+      json
     end
   end
 end

data/lib/engineyard-serverside/cli.rb

@@ -1,8 +1,16 @@
+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",
@@ -48,14 +56,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")
 
-        propagate
+        invoke :propagate
 
         EY::Serverside::Deploy.new(config).send(default_task)
       end
@@ -136,7 +144,7 @@ module EY
 
         EY::Serverside::Server.load_all_from_array(assemble_instance_hashes(config))
 
-        propagate
+        invoke :propagate
 
         EY::Serverside::Server.all.each do |server|
           server.sync_directory app_dir
@@ -182,7 +190,7 @@ module EY
         config = EY::Serverside::Deploy::Configuration.new(options)
         EY::Serverside::Server.load_all_from_array(assemble_instance_hashes(config))
 
-        propagate
+        invoke :propagate
 
         EY::Serverside::Deploy.new(config).restart_with_maintenance_page
       end
@@ -204,22 +212,34 @@ module EY
 
       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? }
-
-        futures = EY::Serverside::Future.call(servers) do |server|
-          installed = server.gem?(ey_server_side.name, ey_server_side.version)
-          unless installed
-            unless server.gem?(ey_server_side.name, ey_server_side.version)
-              puts "~> Installing #{ey_server_side.name} on #{server.hostname}"
-              server.copy(ey_server_side.local_path, ey_server_side.remote_path)
-              installed = server.install_gem(ey_server_side.remote_path)
+        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|
+          !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}'")
             end
           end
-          installed
-        end
-
-        EY::Serverside::Future.success?(futures)
+        end))
       end
 
       private
@@ -233,18 +253,6 @@ module EY
           }
         }
       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,37 +1,13 @@
+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
-      require 'json'
-
       DEFAULT_CONFIG = Thor::CoreExt::HashWithIndifferentAccess.new({
         "branch"         => "master",
         "strategy"       => "Git",
-        "bundle_without" => "test development"
+        "bundle_without" => "test development",
       })
 
       attr_reader :configuration
@@ -88,7 +64,7 @@ module EY
       end
 
       def repository_cache
-        configuration['repository_cache'] || File.join(deploy_to, "/shared/cached-copy")
+        configuration['repository_cache'] || File.join(deploy_to, 'shared', 'cached-copy')
       end
 
       def deploy_to

data/lib/engineyard-serverside/deploy.rb

@@ -145,10 +145,9 @@ To fix this problem, commit your Gemfile.lock to your repository and redeploy.
       # task
       def push_code
         info "~> Pushing code to all servers"
-        futures = EY::Serverside::Future.call(EY::Serverside::Server.all) do |server|
-          server.sync_directory(config.repository_cache)
-        end
-        EY::Serverside::Future.success?(futures)
+        barrier *(EY::Serverside::Server.all.map do |server|
+          need_later { server.sync_directory(config.repository_cache) }
+        end)
       end
 
       # task
@@ -263,7 +262,7 @@ WRAP
       # task
       def copy_repository_cache
         info "~> Copying to #{c.release_path}"
-        run("mkdir -p #{c.release_path} && rsync -aq #{c.exclusions} #{c.repository_cache}/ #{c.release_path}")
+        run("mkdir -p #{c.release_path} #{c.failed_release_dir} && rsync -aq #{c.exclusions} #{c.repository_cache}/ #{c.release_path}")
 
         info "~> Ensuring proper ownership."
         sudo("chown -R #{c.user}:#{c.group} #{c.deploy_to}")
@@ -281,6 +280,10 @@ WRAP
         "/usr/local/ey_resin/ruby/bin/ey-services-setup #{config.app}"
       end
 
+      def node_package_manager_command_check
+        "which npm"
+      end
+
       def setup_services
         info "~> Setting up external services."
         begin
@@ -400,7 +403,7 @@ Deploy again if your services configuration appears incomplete or out of date.
         yield
       rescue Exception
         info "~> Release #{c.release_path} failed, saving release to #{c.failed_release_dir}."
-        sudo "mkdir -p #{c.failed_release_dir} && mv #{c.release_path} #{c.failed_release_dir}"
+        sudo "mv #{c.release_path} #{c.failed_release_dir}"
         raise
       end
 
@@ -463,7 +466,7 @@ Deploy again if your services configuration appears incomplete or out of date.
 
       def check_node_npm
         if File.exist?("#{c.release_path}/package.json")
-          unless run("which npm")
+          unless run(node_package_manager_command_check)
             abort "*** [Error] package.json detected, but npm was not installed"
           else
             info "~> package.json detected, installing npm packages"

data/lib/engineyard-serverside/lockfile_parser.rb

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

data/lib/engineyard-serverside/logged_output.rb

@@ -1,3 +1,5 @@
+require 'open4'
+
 module EY
   module Serverside
     module LoggedOutput

data/lib/engineyard-serverside/server.rb

@@ -83,37 +83,12 @@ 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 #{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)
-        # resin + ruby 1.8.6 need sudo privileges to install gems
-        run("sudo #{gem_command} install -q --no-ri --no-rdoc #{path}")
-      end
-
-      def gem_command
-        File.expand_path('gem', Gem.default_bindir)
+        "ssh -i #{ENV['HOME']}/.ssh/internal -o StrictHostKeyChecking=no -o PasswordAuthentication=no"
       end
 
     end

data/lib/engineyard-serverside/task.rb

@@ -1,6 +1,7 @@
 module EY
   module Serverside
     class Task
+      include Dataflow
 
       attr_reader :config
       alias :c :config
@@ -37,6 +38,9 @@ module EY
         end
       end
 
+      # Returns +true+ if the command is successful,
+      # raises EY::Serverside::RemoteFailure with a list of failures
+      # otherwise.
       def run(cmd, &blk)
         run_on_roles(cmd, &blk)
       end
@@ -47,18 +51,18 @@ module EY
 
       private
 
-      def run_on_roles(cmd, wrapper=%w[sh -l -c], &block)
-        servers = EY::Serverside::Server.from_roles(@roles)
-        futures = EY::Serverside::Future.call(servers, block_given?) do |server, exec_block|
-          to_run = exec_block ? block.call(server, cmd.dup) : cmd
-          server.run(Escape.shell_command(wrapper + [to_run]))
-        end
-
-        unless EY::Serverside::Future.success?(futures)
-          failures = futures.select {|f| f.error? }.map {|f| f.inspect}.join("\n")
-          raise EY::Serverside::RemoteFailure.new(failures)
+      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])) }
         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))
       end
+
     end
   end
 end

data/lib/engineyard-serverside/version.rb

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

data/lib/vendor/dataflow/HISTORY

@@ -0,0 +1,52 @@
+== 0.3.0 / 2009-08-29
+
+* Major enhancements
+ 
+  * "flow" abstraction for threading (use it to create threads and optionally 
+    pass it a variable to be bound output, or override it to modify need_later
+    for other threading strategies such as thread pools)
+
+  * Dataflow::FutureQueue
+
+  * Nested binding through variables possible
+ 
+* Minor enhancements
+  
+  * Better #inspect and UnificationError debugging output
+ 
+  * "barrier" abstraction for manually preventing execution until variable
+    arguments have been bound
+
+  * Use mixin methods as class/module methods optionally
+    e.g. Dataflow.local {|v| v }
+
+== 0.2.1 / 2009-07-29
+
+ * Minor enhancements
+   
+   * Leave __send__ and __id__ alone when acting as a proxy
+
+== 0.2.0 / 2009-07-09
+
+* Major enhancements
+ 
+  * Made equality between objects and dataflow variables more transparent
+    (load equality changes with: require 'dataflow/equality')
+ 
+* Minor enhancements
+  
+  * Made #inspect work with unbound variables to not crash deubggers/repls/etc
+ 
+  * Made relationship between lazy and dataflow behavior more strict
+
+== 0.1.1 / 2009-06-13
+ 
+* Minor enhancements
+ 
+  * Got the "require_path" set correctly so rubygems can be used =) 
+
+== 0.1.0 / 2009-06-13
+ 
+* 1 major enhancement
+ 
+  * Birthday!