pushapp 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7c6168f56805738a57a05657225449a813e051b
-  data.tar.gz: 065babb5465d4bfa4b7db8fdbf9bc749281605df
+  metadata.gz: 203e694479ee12c39d1a51a83db5d9831c6cdd21
+  data.tar.gz: 8f58f6ba7c15b8026177a347b7499a878374d444
 SHA512:
-  metadata.gz: f641812cbd4d78fe542265f85abe7b849b97f86deba286d61985edd25c497d8c6d203ae8f6ebe1c0f236f239afab38c7b995cbf0d87c514aac60dcf66947b63a
-  data.tar.gz: 253644c8b010a60d65f2b8d3752b1d7aca6996b8b464c1960a110a0ef28bb6a28931bdbe21da68bb1dda3ca1040942d1ed3f2ec626616a0d21d19c8fe656e494
+  metadata.gz: 16b497525286740960f09df567336824e94475e8e5498dc3daf5194701cb8fa7d4e08e0cdd692264896c869bf2d46abfa0b1bdc5ac3bd04c12f13a76f62fa013
+  data.tar.gz: 44f137ed65ecd6862941d7dbd07f2ca6e3ed46bbe09f770e7a89126bd23392e63ec1189042f7a5cd9e97cc78fa695196a33732d7fafa3b6e23393fa5d411d0b5

data/README.md

@@ -2,6 +2,10 @@
 
 Simple heroku like deployment system.
 
+<a href='https://vimeo.com/66528056'><img src="https://f.cloud.github.com/assets/5250/523884/d78a70e0-c0e8-11e2-8569-09e00d48a693.gif" width="512"></a>
+
+[full video](https://vimeo.com/66528056)
+
 TODO: notes on blazing
 
 ## Installation

data/lib/pushapp/generators.rb

@@ -76,7 +76,7 @@ module Pushapp
 
     method_option :ruby,
       type: :string,
-      default: '2.0.0-p195'
+      default: '2.0.0-p247'
 
     def chef_solo(remote)
       options[:remote] = remote

data/lib/pushapp/remote.rb

@@ -129,7 +129,7 @@ class Pushapp::Remote
   end
 
   def merge_options task_options={}
-    Pushapp.rmerge(task_options, options).merge(remote: self)
+    Pushapp.rmerge(options, task_options).merge(remote: self)
   end
 
 end

data/lib/pushapp/version.rb

@@ -1,3 +1,3 @@
 module Pushapp
-  VERSION = '0.2.3'
+  VERSION = '0.2.4'
 end

data/test/pushapp/cli_test.rb

@@ -7,20 +7,16 @@ class CLITest < MiniTest::Unit::TestCase
     @cli = Pushapp::CLI.new
   end
 
-  def test_it_has_init_method
-    @cli.respond_to? :init
-  end
-
-  def test_it_has_setup_method
-    @cli.respond_to? :setup
-  end
-
-  def test_it_has_update_method
-    @cli.respond_to? :update
-  end
-
-  def test_it_has_help_method
-    @cli.respond_to? :help
+  def test_cli_protocol
+    assert @cli.respond_to?(:init)
+    assert @cli.respond_to?(:setup)
+    assert @cli.respond_to?(:remotes)
+    assert @cli.respond_to?(:tasks)
+    assert @cli.respond_to?(:trigger)
+    assert @cli.respond_to?(:ssh)
+    assert @cli.respond_to?(:generate)
+    assert @cli.respond_to?(:update_refs)
+    assert @cli.respond_to?(:help)
   end
 
 end

data/test/pushapp/remote_test.rb

@@ -0,0 +1,36 @@
+require 'test_helper'
+require 'pushapp/remote'
+
+class RemoteTest < MiniTest::Unit::TestCase
+
+  def setup
+    remote_options = {
+      default_option: 5,
+      env: {RAILS_ENV: 'production'}
+    }
+    @remote = Pushapp::Remote.new('test', nil, 'tmp', Pushapp::Config.new, remote_options)
+  end
+
+  def test_task_options_override_remote_options
+    @remote.on :push do
+      rake('test1', task_option: 'task option', env: {RAILS_ENV: 'test'})
+      rake('test2')
+    end
+
+    task1 = @remote.tasks_on(:push).first
+
+    assert task1
+    assert task1.options[:task_option] == 'task option'
+    assert task1.options[:default_option] == 5
+    assert task1.options[:env][:RAILS_ENV] == 'test'
+
+    task2 = @remote.tasks_on(:push).last
+
+    assert task2
+    assert task2.options[:task_option] == nil
+    assert task2.options[:default_option] == 5
+    assert task2.options[:env][:RAILS_ENV] == 'production'
+  end
+
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pushapp
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Yury Korolev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-19 00:00:00.000000000 Z
+date: 2013-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -137,6 +137,7 @@ files:
 - test/pushapp/config_test.rb
 - test/pushapp/git_test.rb
 - test/pushapp/pipe_test.rb
+- test/pushapp/remote_test.rb
 - test/pushapp_test.rb
 - test/test_helper.rb
 homepage: https://github.com/anjlab/pushapp
@@ -169,5 +170,6 @@ test_files:
 - test/pushapp/config_test.rb
 - test/pushapp/git_test.rb
 - test/pushapp/pipe_test.rb
+- test/pushapp/remote_test.rb
 - test/pushapp_test.rb
 - test/test_helper.rb