o2h 0.1.12 → 0.1.13

data/lib/o2h/recipes/deploy.rb

@@ -1,3 +1,5 @@
+load 'deploy'
+
 set(:strategy) do
   require 'o2h/capistrano/deploy/strategy/git'
   Capistrano::Deploy::Strategy::Git.new(self)

data/lib/o2h/recipes/sync.rb

@@ -1,3 +1,5 @@
+load 'deploy'
+
 _cset(:sync_db_via) { :scp }
 _cset(:sync_db_file) { "#{application}-dump.sql.gz" }
 _cset(:sync_db_remote_file) { "#{shared_path}/backup/#{sync_db_file}" }
@@ -76,6 +78,7 @@ namespace :sync do
       run_locally "gunzip --stdout #{sync_db_local_file} | #{pg.command}" if agree
     end
 
+    desc "Fetch dump file"
     task :fetch do
       download sync_db_remote_file, sync_db_local_file, :via => sync_db_via
     end

data/lib/o2h/version.rb

@@ -1,3 +1,3 @@
 module O2h
-  VERSION = "0.1.12"
+  VERSION = "0.1.13"
 end

data/spec/recipes/sync_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe "sync" do
-  before { subject.load 'deploy' }
 
   include_context :capistrano
 
@@ -30,5 +29,19 @@ describe "sync" do
       subject.should have_run("mkdir -p '/shared/app/backup'")
       subject.should have_run("pg_dump -c -Z 9 --no-owner -p #{port} -h #{host} -U #{username} -f /shared/app/backup/app-dump.sql.gz #{database}")
     end
+
+    it "should call proper subtasks" do
+      namespace.should_receive(:dump)
+      namespace.should_receive(:fetch)
+      namespace.should_receive(:import)
+
+      subject.execute_task(task)
+    end
+  end
+
+  context 'db:fetch task' do
+    subject { task }
+
+    its(:description) { should match(/fetch/i) }
   end
 end

data/spec/support/shared_contexts/capistrano.rb

@@ -8,6 +8,13 @@ shared_context :capistrano do
   let(:recipe_name) { self.class.top_level_description }
   let(:recipe_path) { recipe(recipe_name) }
 
+  subject           { capistrano }
+
+  before(:each) do
+    capistrano.extend Capistrano::Spec::ConfigurationExtension
+    capistrano.load recipe_path
+  end
+
   let(:task) do
     task = self.class.ancestors.map do |example|
       break $1 if /^(.+?) task$/ =~ example.description
@@ -15,16 +22,10 @@ shared_context :capistrano do
 
     if task
       task = "#{recipe_name}:#{task}"
-      subject.find_task(task) or raise "Task #{task} not found"
+      capistrano.find_task(task) or raise "Task #{task} not found"
     end
   end
 
-  subject         { capistrano }
-
-  before do
-    capistrano.extend Capistrano::Spec::ConfigurationExtension
-    capistrano.load recipe_path
-  end
 
   def recipe name
     Dir["lib/o2h/recipes/**/*.rb"].find do |recipe|

metadata

@@ -1,67 +1,96 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: o2h
-version: !ruby/object:Gem::Version
-  version: 0.1.12
+version: !ruby/object:Gem::Version 
+  hash: 1
   prerelease: 
+  segments: 
+  - 0
+  - 1
+  - 13
+  version: 0.1.13
 platform: ruby
-authors:
+authors: 
 - Michal Cichra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-08 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-02-11 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: newrelic_rpm
-  requirement: &70176353287180 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 3
+        - 3
+        - 0
         version: 3.3.0
   type: :runtime
-  prerelease: false
-  version_requirements: *70176353287180
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: capistrano
-  requirement: &70176353285460 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 43
+        segments: 
+        - 2
+        - 9
+        - 0
         version: 2.9.0
   type: :runtime
-  prerelease: false
-  version_requirements: *70176353285460
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: rvm
-  requirement: &70176353284520 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 55
+        segments: 
+        - 1
+        - 9
+        - 2
         version: 1.9.2
   type: :runtime
-  prerelease: false
-  version_requirements: *70176353284520
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: pg_dumper
-  requirement: &70176353283180 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 0
+        - 1
+        - 7
         version: 0.1.7
   type: :runtime
-  prerelease: false
-  version_requirements: *70176353283180
+  version_requirements: *id004
 description: Collection of recipes and gem dependencies for o2h deployment
-email:
+email: 
 - michal@o2h.cz
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .simplecov
 - .travis.yml
@@ -102,29 +131,38 @@ files:
 - test/config/deploy.rb
 homepage: http://o2h.cz
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Collection of recipes and gem dependencies for o2h deployment
-test_files:
+test_files: 
 - spec/recipes/bluepill_spec.rb
 - spec/recipes/deploy_spec.rb
 - spec/recipes/git_spec.rb