capistrano-cloudflare 0.0.2 → 1.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: bc115805b03ba0ec658a5dba1e009287728b84eb
+  data.tar.gz: b7bc367c5d490b49129b93a96dda44ec89a1f61e
+SHA512:
+  metadata.gz: 6001115c10aa2659be81d970e4bfaae30dde7a83851d63d2646bf4867c9dd642e9f900c0a53f14cadc27e450b23dd1e8eb202150d1d5fe527c057fa6108fa7ba
+  data.tar.gz: 7faf63fac70b2d7fd49c728e5b030d899342f24e57c83bdb4a5863772baf27b9aa6c4c9294f1bee22ba66e286ca6ec8642d5ce515e3e7437598f79562d5c5020

data/.travis.yml

@@ -1,5 +1,6 @@
 language: ruby
 rvm:
-  - ree
-  - 1.9.2
   - 1.9.3
+  - 2.0.0
+  - 2.1.0
+  - 2.1.1

data/README.md

@@ -2,6 +2,8 @@
 
 [CloudFlare](http://www.cloudflare.com/) is a service that protects and speeds up websites. Capistrano Cloudflare provides [Capistrano](https://github.com/capistrano/capistrano/wiki/Documentation-v2.x) tasks to update your CloudFlare settings.
 
+Capistrano CloudFlare Version 1.0 and above supports the new Capistrano v3 API. For compatbility with Capistrano v2, please use version `0.0.2`.
+
 Currently only cache purging is supported.
 
 ## Installation

data/capistrano-cloudflare.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Capistrano::CloudFlare::VERSION
 
-  gem.add_dependency 'capistrano', '>= 2.0'
+  gem.add_dependency 'capistrano', '>= 3.0'
   gem.add_dependency 'json'
 
   gem.add_development_dependency 'rake'

data/lib/capistrano/cloudflare.rb

@@ -2,6 +2,7 @@ require 'capistrano'
 require 'capistrano/cloudflare/version'
 require 'json'
 require 'net/http'
+require 'rake'
 
 module Capistrano
   module CloudFlare
@@ -20,30 +21,7 @@ module Capistrano
       })
       response = JSON.parse(http.request(request).body)
     end
-
-    def self.load_into(configuration)
-      configuration.set :capistrano_cloudflare, self
-      configuration.load do
-        namespace :cloudflare do
-          namespace :cache do
-            desc "Purge the CloudFlare cache"
-            task :purge do
-              raise unless fetch(:cloudflare_options).respond_to?(:[])
-              response = capistrano_cloudflare.send_request(cloudflare_options)
-              if response['result'] == 'success'
-                logger.info("Purged CloudFlare cache for #{cloudflare_options[:domain]}")
-              else
-                logger.info("CloudFlare cache purge failed. Reason: #{response['msg'] || 'unknown.'}")
-              end
-            end
-          end
-        end
-
-      end
-    end
   end
 end
 
-if Capistrano::Configuration.instance
-  Capistrano::CloudFlare.load_into(Capistrano::Configuration.instance)
-end
+load File.expand_path('../tasks/cloudflare.rake', __FILE__)

data/lib/capistrano/cloudflare/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module CloudFlare
-    VERSION = '0.0.2'
+    VERSION = '1.0.0'
   end
 end

data/lib/capistrano/tasks/cloudflare.rake

@@ -0,0 +1,16 @@
+namespace :cloudflare do
+  namespace :cache do
+    desc "Purge the CloudFlare cache"
+    task :purge do
+      on roles(:all) do
+        raise 'Missing CloudFlare configuration.' unless fetch(:cloudflare_options).respond_to?(:[])
+        response = Capistrano::CloudFlare.send_request(fetch(:cloudflare_options))
+        if response['result'] == 'success'
+          info "Purged CloudFlare cache for #{fetch(:cloudflare_options)[:domain]}"
+        else
+          error "CloudFlare cache purge failed. Reason: #{response['msg'] || 'unknown.'}"
+        end
+      end
+    end
+  end
+end

data/spec/capistrano/cloudflare_spec.rb

@@ -1,30 +1,22 @@
 require 'spec_helper'
 
 describe Capistrano::CloudFlare do
-  before do
-    @configuration = Capistrano::Configuration.new
-    Capistrano::CloudFlare.load_into(@configuration)
-    @options = { :domain  => 'example.com',
-                 :email   => 'me@example.com',
-                 :api_key => 'F' }
-    stub_request(:post, 'https://www.cloudflare.com/api_json.html').to_return(
-      :status => 200, :body => '{}'
-    )
+  it { should be_a Module }
 
-  end
-
-  it { described_class.should be_a Module }
+  describe '.send_request' do
+    it 'should POST to the cloudflare API and return the response body as a hash' do
+      options = {
+        domain:   'example.com',
+        email:    'me@example.com',
+        api_key:  'F'
+      }
 
-  specify 'cloudflare:cache:purge' do
-    @configuration.find_task('cloudflare:cache:purge').should_not == nil
-    expect { @configuration.find_and_execute_task('cloudflare:cache:purge') }.to raise_error
-
-    @configuration.set(:cloudflare_options, @options)
-    expect { @configuration.find_and_execute_task('cloudflare:cache:purge') }.to_not raise_error
-  end
+      body = { 'result' => 'success' }
+      stub_request(:post, 'https://www.cloudflare.com/api_json.html').to_return(
+        :status => 200, :body => body.to_json
+      )
 
-  specify 'send_request' do
-    # TODO: Improve testing here
-    described_class.send_request(@options).should be_a_kind_of(Hash)
+      Capistrano::CloudFlare.send_request(options).should eq(body)
+    end
   end
 end

metadata

@@ -1,110 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-cloudflare
 version: !ruby/object:Gem::Version
-  version: 0.0.2
-  prerelease: 
+  version: 1.0.0
 platform: ruby
 authors:
 - Nathan L Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-20 00:00:00.000000000 Z
+date: 2014-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: capistrano-spec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Capistrano extensions for CloudFlare
@@ -114,9 +101,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - Guardfile
 - LICENSE
@@ -125,31 +112,31 @@ files:
 - capistrano-cloudflare.gemspec
 - lib/capistrano/cloudflare.rb
 - lib/capistrano/cloudflare/version.rb
+- lib/capistrano/tasks/cloudflare.rake
 - spec/capistrano/cloudflare_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/cramerdev/capistrano-cloudflare
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Lets you make CloudFlare API calls when deploying with Capistrano.
 test_files:
 - spec/capistrano/cloudflare_spec.rb