engineyard-serverside-adapter 2.0.1 → 2.0.2

data/Rakefile

@@ -6,11 +6,15 @@ task :default => :spec
 
 desc "Release engineyard-serverside-adapter gem"
 task :release do
-  new_version = bump_to_latest_serverside
-  (system("git add lib/engineyard-serverside-adapter/version.rb") &&
-    system("git commit -am 'Bump to engineyard-serverside version #{new_version}'") &&
-    system("git tag v#{new_version}") &&
-    system("gem build engineyard-serverside-adapter.gemspec"))
+  puts "Adapter DOES NOT bump serverside automatically anymore."
+  puts "Please reference the serverside_version in the client."
+  puts
+  new_version = remove_pre
+
+  run_commands("git tag v#{new_version}",
+    "gem build engineyard-serverside-adapter.gemspec")
+
+  next_pre(new_version)
 
   puts <<-PUSHGEM
 ## To publish the gem: #########################################################
@@ -22,25 +26,41 @@ task :release do
   PUSHGEM
 end
 
-def bump_to_latest_serverside
-  specs = Gem::SpecFetcher.fetcher.fetch(Gem::Dependency.new("engineyard-serverside"))
-  versions = specs.map {|spec,| spec.version}.sort
-  new_version = versions.last.to_s
-
-  serverside_version_file =<<-EOT
-module EY
-  module Serverside
-    class Adapter
-      VERSION = "#{new_version}"
-      ENGINEYARD_SERVERSIDE_VERSION = ENV['ENGINEYARD_SERVERSIDE_VERSION'] || "#{new_version}"
-    end
+def version_path
+  Pathname.new('lib/engineyard-serverside-adapter/version.rb')
+end
+
+def run_commands(*cmds)
+  cmds.flatten.each do |c|
+    system(c) or raise "Command #{c.inspect} failed to execute; aborting!"
   end
 end
-  EOT
 
-  puts "Using engineyard-serverside version #{new_version}"
-  File.open('lib/engineyard-serverside-adapter/version.rb', 'w') do |f|
-    f.write serverside_version_file
+def remove_pre
+  require 'engineyard-serverside-adapter/version'
+  version = EY::Serverside::Adapter::VERSION
+  unless version =~ /\.pre$/
+    raise "Version #{version.inspect} does not end with .pre, you should release manually if you want a custom version name."
   end
+  new_version = version.gsub(/\.pre$/, '')
+  puts "New version is #{new_version}"
+  bump(new_version, "Bump to version #{new_version}")
   new_version
 end
+
+def next_pre(version)
+  digits = version.scan(/(\d+)/).map { |x| x.first.to_i }
+  digits[-1] += 1
+  new_version = digits.join('.') + ".pre"
+  puts "Next version is #{new_version}"
+  bump(new_version, "Add .pre for next release")
+end
+
+def bump(new_version, commit_msg)
+  contents = version_path.read.sub(/VERSION = "[^"]+"/, %|VERSION = "#{new_version}"|)
+  version_path.unlink
+  version_path.open('w') { |f| f.write contents }
+  run_commands(
+    "git add #{version_path}",
+    "git commit -m '#{commit_msg}'")
+end

data/lib/engineyard-serverside-adapter/action.rb

@@ -10,6 +10,7 @@ module EY
           @gem_bin_path = Pathname.new(options[:gem_bin_path] || "")
           arguments = options[:arguments] || Arguments.new
           block.call arguments if block
+          @serverside_version = arguments.serverside_version
 
           extract_state_from_arguments(arguments)
           validate!
@@ -45,8 +46,12 @@ module EY
           "(#{check_command}) || (#{install_command})"
         end
 
+        def engineyard_serverside_version
+          @serverside_version || ENGINEYARD_SERVERSIDE_VERSION
+        end
+
         def check_command
-          escaped_engineyard_serverside_version = ENGINEYARD_SERVERSIDE_VERSION.gsub(/\./, '\.')
+          escaped_engineyard_serverside_version = engineyard_serverside_version.gsub(/\./, '\.')
 
           [
             Escape.shell_command([gem_path, "list", "engineyard-serverside"]),
@@ -62,7 +67,7 @@ module EY
           #
           # rubygems help suggests that --remote will disable this
           # behavior, but it doesn't.
-          install_command = "cd `mktemp -d` && #{gem_path} install engineyard-serverside --no-rdoc --no-ri -v #{ENGINEYARD_SERVERSIDE_VERSION}"
+          install_command = "cd `mktemp -d` && #{gem_path} install engineyard-serverside --no-rdoc --no-ri -v #{engineyard_serverside_version}"
           Escape.shell_command(['sudo', 'sh', '-c', install_command])
         end
 
@@ -71,7 +76,7 @@ module EY
         end
 
         def action_command
-          cmd = Command.new(@gem_bin_path, *task)
+          cmd = Command.new(@gem_bin_path, engineyard_serverside_version, *task)
           @state.each do |option_name, value|
             option_type = self.class.options[option_name][:type]
             switch = "--" + option_name.to_s.gsub(/_/, '-')

data/lib/engineyard-serverside-adapter/arguments.rb

@@ -1,27 +1,22 @@
 module EY
   module Serverside
     class Adapter
-      class Arguments < Struct.new(:app, :environment_name, :account_name, :config, :framework_env, :instances, :migrate, :ref, :repo, :stack, :verbose)
-
-        def app=(app)
-          enforce_nonempty!('app', app)
-          super
-        end
-
-        def environment_name=(env)
-          enforce_nonempty!('environment_name', env)
-          super
-        end
-
-        def account_name=(acc)
-          enforce_nonempty!('account_name', acc)
-          super
+      class Arguments
+
+        def self.nonempty_writer(*names)
+          names.each do |name|
+            define_method(:"#{name}=") do |value|
+              if value.to_s.empty?
+                raise ArgumentError, "Value for '#{name}' must be non-empty."
+              end
+              instance_variable_set("@#{name}", value)
+            end
+          end
         end
 
-        def framework_env=(framework_env)
-          enforce_nonempty!('framework_env', framework_env)
-          super
-        end
+        attr_reader     :app, :environment_name, :account_name, :config, :framework_env, :instances, :migrate, :ref, :repo, :serverside_version, :stack, :verbose
+        nonempty_writer :app, :environment_name, :account_name, :framework_env, :ref, :repo, :serverside_version, :stack
+        attr_writer     :config, :migrate, :verbose
 
         def instances=(instances)
           unless instances.respond_to?(:each)
@@ -38,30 +33,11 @@ module EY
             end
           end
 
-          super
+          @instances = instances
         end
 
-        def ref=(ref)
-          enforce_nonempty!('ref', ref)
-          super
-        end
-
-        def repo=(repo)
-          enforce_nonempty!('repo', repo)
-          super
-        end
-
-        def stack=(stack)
-          enforce_nonempty!('stack', stack)
-          super
-        end
-
-        private
-
-        def enforce_nonempty!(name, value)
-          if value.to_s.empty?
-            raise ArgumentError, "Value for '#{name}' must be non-empty."
-          end
+        def serverside_version=(value)
+          @serverside_version = Gem::Version.new(value).to_s
         end
 
       end

data/lib/engineyard-serverside-adapter/command.rb

@@ -5,14 +5,15 @@ module EY
   module Serverside
     class Adapter
       class Command
-        def initialize(bin_path, *task)
+        def initialize(bin_path, serverside_version, *task)
+          @binary = bin_path.join('engineyard-serverside').to_s
+          @serverside_version = serverside_version
           @task = task
           @arguments = []
-          @binary = bin_path.join('engineyard-serverside').to_s
         end
 
         def to_s
-          Escape.shell_command [@binary, "_#{ENGINEYARD_SERVERSIDE_VERSION}_"] + @task + @arguments.sort_by { |x| x.first }.flatten
+          Escape.shell_command [@binary, "_#{@serverside_version}_"] + @task + @arguments.sort_by { |x| x.first }.flatten
         end
 
         def array_argument(switch, values)

data/lib/engineyard-serverside-adapter/version.rb

@@ -1,7 +1,10 @@
 module EY
   module Serverside
     class Adapter
-      VERSION = "2.0.1"
+      VERSION = "2.0.2"
+      # For backwards compatibility, the serverside version default will be maintained until 2.1
+      # It is recommended that you supply a serverside_version to engineyard-serverside-adapter
+      # rather than relying on the default version here. This default will go away soon.
       ENGINEYARD_SERVERSIDE_VERSION = ENV['ENGINEYARD_SERVERSIDE_VERSION'] || "2.0.1"
     end
   end

data/spec/adapter_spec.rb

@@ -76,6 +76,18 @@ shared_examples_for "a serverside action" do
       commands.last.should =~ %r{^/usr/local/grin/engineyard-serverside}
     end
   end
+
+  context "with an alternate serverside_version specified" do
+    it "uses the given version for the gem install and serverside commands" do
+      action = @adapter.send(@method) do |args|
+        args.serverside_version = '1.6.4'
+      end
+
+      commands = all_commands(action)
+      commands.first.should == "(gem list engineyard-serverside | grep 'engineyard-serverside ' | egrep -q '1\\.6\\.4[,)]') || (sudo sh -c 'cd `mktemp -d` && gem install engineyard-serverside --no-rdoc --no-ri -v 1.6.4')"
+      commands.last.should =~ /engineyard-serverside _1\.6\.4_/
+    end
+  end
 end
 
 describe EY::Serverside::Adapter do

data/spec/arguments_spec.rb

@@ -25,4 +25,10 @@ describe EY::Serverside::Adapter::Arguments do
     end
   end
 
+  it "raises an ArgumentError immediately when serverside_version is weird" do
+    raises_argument_error(/Malformed version number string what the flower/) do |arguments|
+      arguments.serverside_version = 'what the flower'
+    end
+  end
+
 end

data/spec/deploy_spec.rb

@@ -13,6 +13,7 @@ describe EY::Serverside::Adapter::Deploy do
   it_should_behave_like "it accepts repo"
   it_should_behave_like "it accepts stack"
   it_should_behave_like "it accepts verbose"
+  it_should_behave_like "it accepts serverside_version"
 
   it_should_require :app
   it_should_require :environment_name

data/spec/disable_maintenance_spec.rb

@@ -8,6 +8,7 @@ describe EY::Serverside::Adapter::DisableMaintenance do
   it_should_behave_like "it accepts account_name"
   it_should_behave_like "it accepts instances"
   it_should_behave_like "it accepts verbose"
+  it_should_behave_like "it accepts serverside_version"
 
   it_should_require :app
   it_should_require :environment_name

data/spec/enable_maintenance_spec.rb

@@ -8,6 +8,7 @@ describe EY::Serverside::Adapter::EnableMaintenance do
   it_should_behave_like "it accepts account_name"
   it_should_behave_like "it accepts instances"
   it_should_behave_like "it accepts verbose"
+  it_should_behave_like "it accepts serverside_version"
 
   it_should_require :app
   it_should_require :environment_name

data/spec/integrate_spec.rb

@@ -10,6 +10,7 @@ describe EY::Serverside::Adapter::Integrate do
   it_should_behave_like "it accepts instances"
   it_should_behave_like "it accepts stack"
   it_should_behave_like "it accepts verbose"
+  it_should_behave_like "it accepts serverside_version"
 
   it_should_require :app
   it_should_require :environment_name

data/spec/restart_spec.rb

@@ -9,6 +9,7 @@ describe EY::Serverside::Adapter::Restart do
   it_should_behave_like "it accepts instances"
   it_should_behave_like "it accepts stack"
   it_should_behave_like "it accepts verbose"
+  it_should_behave_like "it accepts serverside_version"
 
   it_should_require :app
   it_should_require :environment_name

data/spec/rollback_spec.rb

@@ -10,6 +10,7 @@ describe EY::Serverside::Adapter::Rollback do
   it_should_behave_like "it accepts instances"
   it_should_behave_like "it accepts stack"
   it_should_behave_like "it accepts verbose"
+  it_should_behave_like "it accepts serverside_version"
 
   it_should_require :app
   it_should_require :environment_name

data/spec/spec_helper.rb

@@ -142,6 +142,13 @@ RSpec.configure do |config|
     end
   end
 
+  shared_examples_for "it accepts serverside_version" do
+    it "puts the _VERSION_ command part in the command line" do
+      adapter = described_class.new(:arguments => arguments_with(:serverside_version => '1.2.3'))
+      last_command(adapter).should =~ /engineyard-serverside _1.2.3_/
+    end
+  end
+
   shared_examples_for "it accepts instances" do
     context "given an unnamed instance" do
       it "puts the instance in the command line" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: engineyard-serverside-adapter
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-21 00:00:00.000000000 Z
+date: 2012-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape
@@ -125,7 +125,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2222852426500600601
+      hash: 3765689580942820898
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: