sunshine 1.2.1 → 1.2.2

data/History.txt

@@ -1,3 +1,9 @@
+=== 1.2.2 / 2010-10-13
+
+* Bugfixes:
+
+  * Added support for ruby 1.9.2
+
 === 1.2.1 / 2010-10-05
 
 * Improvements:

data/lib/sunshine.rb

@@ -25,7 +25,7 @@ module Sunshine
 
   ##
   # Sunshine version.
-  VERSION = '1.2.1'
+  VERSION = '1.2.2'
 
   ##
   # Path to the list of installed sunshine apps.

data/lib/sunshine/app.rb

@@ -1138,7 +1138,7 @@ module Sunshine
       method  = options[:no_threads] ? :each : :threaded_each
       auto_session = !options[:no_session]
 
-      block = lambda do
+      block = lambda do |*|
         send(method, search_options) do |server_app|
 
           if block_given?
@@ -1151,7 +1151,7 @@ module Sunshine
       end
 
 
-      msg_block = lambda do
+      msg_block = lambda do |*|
         if message
           Sunshine.logger.info(:app, message, &block)
 

data/test/test_helper.rb

@@ -21,8 +21,6 @@ unless MockObject === Sunshine.shell
   Sunshine.shell.mock :write, :return => nil
 end
 
-YAML.extend MockObject unless MockObject === YAML
-
 unless Sunshine::Dependency.include? MockObject
   Sunshine::Dependency.send(:include, MockObject)
 end

data/test/unit/test_app.rb

@@ -361,13 +361,12 @@ class TestApp < Test::Unit::TestCase
        check_ruby  => [:err, ""]},
       {:sudo => yum_sudo}
 
-    @app.install_deps 'ruby', nginx_dep
+    @app.install_deps 'ruby', nginx_dep, :no_threads => true
 
 
     each_remote_shell do |ds|
       [nginx_dep, ruby_dep].each do |dep|
-        check =
-          "test \"$(yum list installed #{dep.pkg} | grep -c #{dep.pkg})\" -ge 1"
+        check   = dep.instance_variable_get "@check"
         install = dep.instance_variable_get "@install"
 
         assert_ssh_call check, ds, :sudo => yum_sudo
@@ -392,14 +391,15 @@ class TestApp < Test::Unit::TestCase
       set_mock_response_for @app, 1, {check => [:err, ""]}, {:sudo => gem_sudo}
     end
 
-    @app.install_deps 'rake', bundler_dep
+    @app.install_deps 'rake', bundler_dep, :no_threads => true
 
     each_remote_shell do |ds|
       [rake_dep, bundler_dep].each do |dep|
 
+        check   = dep.instance_variable_get "@check"
         install = dep.instance_variable_get "@install"
 
-        assert_ssh_call checks[dep], ds, :sudo => gem_sudo
+        assert_ssh_call check, ds, :sudo => gem_sudo
         assert_ssh_call install, ds, :sudo => gem_sudo
       end
     end

data/test/unit/test_shell.rb

@@ -24,13 +24,13 @@ class TestShell < Test::Unit::TestCase
 
   def test_ask
     @shell.ask "input something!"
-    assert 1, @shell.input.method_call_count(:ask)
+    assert_equal 1, @shell.input.method_call_count(:ask)
   end
 
 
   def test_close
     @shell.close
-    assert 1, @shell.output.method_call_count(:close)
+    assert_equal 1, @shell.output.method_call_count(:close)
   end
 
 

data/test/unit/test_sunshine.rb

@@ -162,8 +162,11 @@ class TestSunshine < Test::Unit::TestCase
   end
 
   def mock_yaml_load_file
-    YAML.mock :load_file, :args   => [Sunshine::USER_CONFIG_FILE],
-                          :return => Sunshine::DEFAULT_CONFIG
+    YAML.instance_eval do
+      undef load_file
+      def load_file file
+        Sunshine::DEFAULT_CONFIG
+      end
+    end
   end
-
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: sunshine
 version: !ruby/object:Gem::Version 
-  hash: 29
   prerelease: false
   segments: 
   - 1
   - 2
-  - 1
-  version: 1.2.1
+  - 2
+  version: 1.2.2
 platform: ruby
 authors: 
 - Jeremie Castagna
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-12 00:00:00 -07:00
+date: 2010-10-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 21
         segments: 
         - 1
         - 0
@@ -42,7 +40,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 31
         segments: 
         - 1
         - 0
@@ -58,7 +55,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 1
         segments: 
         - 1
         - 5
@@ -74,7 +70,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 31
         segments: 
         - 1
         - 2
@@ -90,7 +85,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 2
         - 0
@@ -106,7 +100,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
         segments: 
         - 2
         - 6
@@ -227,7 +220,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 3148348221185696029
       segments: 
       - 0
       version: "0"
@@ -236,7 +229,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"