capistrano-ci 0.0.3 → 0.0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDNkMTcwNGI4NjJkYzQ0MzU0YmMzM2I3MzM2NDgwMjY4NGZkOGRlNg==
+    MDQ4NDgxNzJiMWM2Njk5OGU0ZGMzMWJmYzA2YTk2YjVjNDEzOWIxMw==
   data.tar.gz: !binary |-
-    NmU1Mzk1YjA4N2JkZDVhODNmZWExNWQzZTAzNTNiOGQ2NzNjY2U2MA==
+    OWE0MTNhNGE1OWRmNjMzMjEwYTE4NmU2N2YyZGRkZmRjYzNkYmRhOQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YWQyZmFmZjg0MTI4ZWQ1MjIzOTY4Y2VlZTlhMzZhNjc5ZTdhZTZmZTNkYzEz
-    N2EyYTBlYTc1M2NjYjVmZjZlMmY2N2NlMTg5YTc0OTA3ZDU5ODdhMDJhMmU2
-    OTIzNjEzY2U3NjAyOTI1ZTk2MjI2ODM3MTc0OGNmZWFhNDQ4YmI=
+    OTIyMDNkOGMyNzAwMTBlOWJmZTkwOTczNjU0ZDNjZGQyNWM0NWRmZWU3YWNl
+    Mzc4N2E0Zjk2NTA5MDRlNGE5Y2M4OWE1YWNkMzQ1NGUyNTgyNDU2YTBlOGVl
+    NTBiZDc5NTM3NDY2ZWVhYmZkMjIyODNlZmFjMDBjYmRkY2ZkMmU=
   data.tar.gz: !binary |-
-    MzBmNTYwMzMxNDk3NDFjNDY2ZjU1ZWUzNjM5NzQxMGY5NThkYjExMTQ0NzE5
-    ZDYwNzBlZGJiYzFhNmNlMmJjNzYzOTZiZDgyYzllNjI1ZWI0ZmIwZDUwZDJi
-    ZTA4YjFlZDkxY2I2ZjE1NzNmZjAzYTA3NzcxZGQzYjdhNTgyYmM=
+    NzEzZWM4MzUzOWNmZjk2NzQyY2ZjNDhkYmI2MTZhMmNiOWFjZTIzMzRhNWEx
+    YTMxYzQ4ZjBmNTFmMmY1Zjg3YTNmY2I1OTk2NzM5ZjI3OTdmMTIyOTMyM2M5
+    MjJhNDlmNmI2ZDlmMWRjNTBmZGY4Nzc1NWRkNGI0OTY5NzViNGE=

data/.travis.yml

@@ -2,6 +2,7 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1.1
   - ruby-head
 notifications:
   email: false

data/README.md

@@ -1,5 +1,5 @@
 # Capistrano::Ci
-[![Build Status](https://travis-ci.org/railsware/capistrano-ci.png)](https://travis-ci.org/railsware/capistrano-ci)
+[![Build Status](https://travis-ci.org/railsware/capistrano-ci.svg?branch=master)](https://travis-ci.org/railsware/capistrano-ci)
 
 
 ## Introduction
@@ -26,7 +26,7 @@ Or install it yourself as:
 
 Add to your Capfile:
 
-    require 'capistrano/ci/recipies'
+    require 'capistrano/ci/recipes'
 
 ## Configuration
 
@@ -40,16 +40,16 @@ Variables list:
 
 Setup ci_client and ci_repository variables in your deployment script:
 
-     set(:ci_client){ "travis" }
-     set(:ci_repository){ "organisation-or-user/repository-name" }
+     set :ci_client, "travis"
+     set :ci_repository, "organisation-or-user/repository-name"
 
 ### Pro Account of Travis-CI:
 
 Additional to ci_client and ci_repository setup ci_access_token:
 
-     set(:ci_client){ "travis_pro" }
-     set(:ci_repository){ "organisation-or-user/repository-name" }
-     set(:ci_access_token){ "your-pro-access-token" }
+     set :ci_client, "travis_pro"
+     set :ci_repository, "organisation-or-user/repository-name"
+     set :ci_access_token, "your-pro-access-token"
 
 Read explaination [how to obtain Travis-CI access token](http://railsware.com/blog/2013/09/10/capistrano-recipe-for-checking-travis-ci-build-status/). To have more information about Travis-CI access token follow [this blog post](http://about.travis-ci.org/blog/2013-01-28-token-token-token).
 
@@ -57,28 +57,24 @@ Read explaination [how to obtain Travis-CI access token](http://railsware.com/bl
 
 Setup ci_client, ci_repository and ci_access_token in your deployment script:
 
-     set(:ci_client){ "circle" }
-     set(:ci_repository){ "organisation-or-user/repository-name" }
-     set(:ci_access_token){ "your-circle-access-token" }
+     set :ci_client, "circle"
+     set :ci_repository, "organisation-or-user/repository-name"
+     set :ci_access_token, "your-circle-access-token"
 
 ### Semaphore:
 
 Setup ci_client, ci_repository and ci_access_token in your deployment script:
 
-    set(:ci_client){ "semaphore" }
-    set(:ci_repository){ "organisation-or-user/repository-name" }
-    set(:ci_access_token){ "your-semaphore-access-token" }
+    set :ci_client, "semaphore"
+    set :ci_repository, "organisation-or-user/repository-name"
+    set :ci_access_token, "your-semaphore-access-token"
 
 ### Enable ci:verify task:
 
-     before 'deploy' do
-       ci.verify
-     end
+     before 'deploy', 'ci:verify'
 
      # or in case of using capistrano-patch:
-     before 'patch:create' do
-       ci.verify
-     end
+     before 'patch:create', 'ci:verify'
 
 ## Contributing
 

data/lib/capistrano/ci/client.rb

@@ -19,9 +19,9 @@ module Capistrano
       end
 
 
-      def initialize(config)
+      def initialize(context)
         @config = self.class.settings.inject({}) do |result, key|
-          result[key] = config[key] if config.exists?(key)
+          result[key] = context.fetch(key)
           result
         end
       end

data/lib/capistrano/ci/recipes.rb

@@ -1,19 +1,8 @@
+require 'capistrano/version'
 require 'capistrano/ci'
 
-Capistrano::Configuration.instance(true).load do
-  namespace :ci do
-    desc "verification of branch build status on CI"
-    task :verify do
-      begin
-        client = Capistrano::CI::Client.new self
-
-        unless client.passed?(branch)
-          Capistrano::CLI.ui.say "Your '#{branch}' branch has '#{client.state(branch)}' state on CI."
-          Capistrano::CLI.ui.ask("Continue anyway? (y/N)") == 'y' or abort
-        end
-      rescue => e
-        Capistrano::CLI.ui.say "#{e.class.name}: #{e.message}"
-      end
-    end
-  end
-end
+if defined?(Capistrano::VERSION) && Gem::Version.new(Capistrano::VERSION).release >= Gem::Version.new('3.0.0')
+  load 'capistrano/ci/recipes/v3.rake'
+else
+  load 'capistrano/ci/recipes/v2.rb'
+end

data/lib/capistrano/ci/recipes/v2.rb

@@ -0,0 +1,17 @@
+Capistrano::Configuration.instance(true).load do
+  namespace :ci do
+    desc "verification of branch build status on CI"
+    task :verify do
+      begin
+        client = Capistrano::CI::Client.new self
+
+        unless client.passed?(branch)
+          Capistrano::CLI.ui.say "Your '#{branch}' branch has '#{client.state(branch)}' state on CI."
+          Capistrano::CLI.ui.ask("Continue anyway? (y/N)") == 'y' or abort
+        end
+      rescue => e
+        Capistrano::CLI.ui.say "#{e.class.name}: #{e.message}"
+      end
+    end
+  end
+end

data/lib/capistrano/ci/recipes/v3.rake

@@ -0,0 +1,18 @@
+namespace :ci do
+  desc "verification of branch build status on CI"
+  task :verify do
+    begin
+      client = Capistrano::CI::Client.new self
+
+      branch = fetch(:branch)
+      unless client.passed?(branch)
+        puts "Your '#{branch}' branch has '#{client.state(branch)}' state on CI."
+        puts "Continue anyway? (y/N)"
+
+        abort if $stdin.gets.chomp != 'y'
+      end
+    rescue => e
+      puts "#{e.class.name}: #{e.message}"
+    end
+  end
+end

data/lib/capistrano/ci/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Ci
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-ci
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - paladiy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-24 00:00:00.000000000 Z
+date: 2014-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -144,6 +144,8 @@ files:
 - lib/capistrano/ci/clients/travis.rb
 - lib/capistrano/ci/clients/travis_pro.rb
 - lib/capistrano/ci/recipes.rb
+- lib/capistrano/ci/recipes/v2.rb
+- lib/capistrano/ci/recipes/v3.rake
 - lib/capistrano/ci/version.rb
 - spec/capistrano/ci/client_spec.rb
 - spec/capistrano/ci/clients/base_spec.rb