whiskey_disk 0.0.7 → 0.3.0

data/spec/whiskey_disk/rake_spec.rb

@@ -0,0 +1,255 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper.rb'))
+require 'rake'
+
+describe 'rake tasks' do
+  before do
+    Rake.application = @rake = Rake::Application.new
+    load File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'lib', 'whiskey_disk', 'rake.rb'))
+    WhiskeyDisk.reset
+  end
+
+  after do
+    Rake.application = nil
+  end
+  
+  describe 'deploy:setup' do
+    before do
+      @configuration = { }
+      WhiskeyDisk::Config.stub!(:fetch).and_return(@configuration)
+      [ 
+        :ensure_main_parent_path_is_present, 
+        :ensure_config_parent_path_is_present,
+        :checkout_main_repository,
+        :install_hooks,
+        :checkout_configuration_repository,
+        :update_main_repository_checkout,
+        :update_configuration_repository_checkout,
+        :refresh_configuration,
+        :run_post_setup_hooks, 
+        :flush
+      ].each do |meth| 
+        WhiskeyDisk.stub!(meth) 
+      end
+    end
+    
+    it 'should make changes on the specified domain when a domain is specified' do
+      @configuration = { 'domain' => 'some domain' }
+      WhiskeyDisk::Config.stub!(:fetch).and_return(@configuration)
+      @rake["deploy:setup"].invoke
+      WhiskeyDisk.should.be.remote
+    end
+    
+    it 'should make changes on the local system when no domain is specified' do
+      @configuration = { 'domain' => '' }
+      WhiskeyDisk::Config.stub!(:fetch).and_return(@configuration)        
+      WhiskeyDisk.should.not.be.remote
+    end
+    
+    it 'should ensure that the parent path for the main repository checkout is present' do
+      WhiskeyDisk.should.receive(:ensure_main_parent_path_is_present)
+      @rake["deploy:setup"].invoke
+    end
+    
+    describe 'when a configuration repo is specified' do
+      it 'should ensure that the parent path for the configuration repository checkout is present' do
+        WhiskeyDisk.stub!(:has_config_repo?).and_return(true)
+        WhiskeyDisk.should.receive(:ensure_config_parent_path_is_present)
+        @rake["deploy:setup"].invoke    
+      end
+    end
+    
+    describe 'when no configuration repo is specified' do
+      it 'should not ensure that the path for the configuration repository checkout is present' do
+        WhiskeyDisk.stub!(:has_config_repo?).and_return(false)
+        WhiskeyDisk.should.not.receive(:ensure_config_parent_path_is_present)
+        @rake["deploy:setup"].invoke        
+      end
+    end
+    
+    it 'should check out the main repository' do
+      WhiskeyDisk.should.receive(:checkout_main_repository)
+      @rake["deploy:setup"].invoke
+    end
+    
+    describe 'when a configuration repository is specified' do
+      it 'should check out the configuration repository' do
+        WhiskeyDisk.stub!(:has_config_repo?).and_return(true)
+        WhiskeyDisk.should.receive(:checkout_configuration_repository)
+        @rake["deploy:setup"].invoke
+      end
+    end
+    
+    describe 'when no configuration repository is specified' do
+      it 'should not check out the configuration repository' do
+        WhiskeyDisk.stub!(:has_config_repo?).and_return(false)
+        WhiskeyDisk.should.not.receive(:checkout_configuration_repository)
+        @rake["deploy:setup"].invoke
+      end
+    end
+    
+    it 'should update the main repository checkout' do
+      WhiskeyDisk.should.receive(:update_main_repository_checkout)
+      @rake["deploy:setup"].invoke
+    end
+    
+    describe 'when a configuration repository is specified' do
+      it 'should update the configuration repository checkout' do
+        WhiskeyDisk.stub!(:has_config_repo?).and_return(true)
+        WhiskeyDisk.should.receive(:update_configuration_repository_checkout)
+        @rake["deploy:setup"].invoke
+      end
+    end
+    
+    describe 'when no configuration repository is specified' do
+      it 'should update the configuration repository checkout' do
+        WhiskeyDisk.stub!(:has_config_repo?).and_return(false)
+        WhiskeyDisk.should.not.receive(:update_configuration_repository_checkout)
+        @rake["deploy:setup"].invoke
+      end
+    end
+
+    describe 'when a configuration repository is specified' do      
+      it 'should refresh the configuration' do
+        WhiskeyDisk.stub!(:has_config_repo?).and_return(true)
+        WhiskeyDisk.should.receive(:refresh_configuration)
+        @rake["deploy:setup"].invoke
+      end
+    end
+    
+    describe 'when no configuration repository is specified' do      
+      it 'should not refresh the configuration' do
+        WhiskeyDisk.stub!(:has_config_repo?).and_return(false)
+        WhiskeyDisk.should.not.receive(:refresh_configuration)
+        @rake["deploy:setup"].invoke
+      end
+    end
+    
+    it 'should run any post setup hooks' do        
+      WhiskeyDisk.should.receive(:run_post_setup_hooks)
+      @rake["deploy:setup"].invoke
+    end
+    
+    it 'should flush WhiskeyDisk changes' do
+      WhiskeyDisk.should.receive(:flush)
+      @rake["deploy:setup"].invoke
+    end
+  end
+  
+  describe 'deploy:now' do
+    before do
+      @configuration = { }
+      WhiskeyDisk::Config.stub!(:fetch).and_return(@configuration)
+      [ 
+        :update_main_repository_checkout,
+        :update_configuration_repository_checkout,
+        :refresh_configuration,
+        :run_post_deploy_hooks,
+        :flush
+      ].each do |meth| 
+        WhiskeyDisk.stub!(meth) 
+      end
+    end
+    
+    it 'should make changes on the specified domain when a domain is specified' do
+      @configuration = { 'domain' => 'some domain'}
+      WhiskeyDisk::Config.stub!(:fetch).and_return(@configuration)
+      @rake["deploy:now"].invoke
+      WhiskeyDisk.should.be.remote
+    end
+    
+    it 'should make changes on the local system when no domain is specified' do
+      WhiskeyDisk.should.not.be.remote
+    end
+    
+    it 'should update the main repository checkout' do
+      WhiskeyDisk.should.receive(:update_main_repository_checkout)
+      @rake["deploy:now"].invoke
+    end
+    
+    describe 'when a configuration repository is specified' do
+      it 'should update the configuration repository checkout' do
+        WhiskeyDisk.stub!(:has_config_repo?).and_return(true)
+        WhiskeyDisk.should.receive(:update_configuration_repository_checkout)
+        @rake["deploy:now"].invoke
+      end
+    end
+    
+    describe 'when no configuration repository is specified' do
+      it 'should not update the configuration repository checkout' do
+        WhiskeyDisk.stub!(:has_config_repo?).and_return(false)
+        WhiskeyDisk.should.not.receive(:update_configuration_repository_checkout)
+        @rake["deploy:now"].invoke
+      end
+    end
+    
+    describe 'when a configuration repository is specified' do
+      it 'should refresh the configuration' do
+        WhiskeyDisk.stub!(:has_config_repo?).and_return(true)
+        WhiskeyDisk.should.receive(:refresh_configuration)
+        @rake["deploy:now"].invoke
+      end
+    end
+    
+    describe 'when no configuration repository is specified' do
+      it 'should not refresh the configuration' do
+        WhiskeyDisk.stub!(:has_config_repo?).and_return(false)
+        WhiskeyDisk.should.not.receive(:refresh_configuration)
+        @rake["deploy:now"].invoke
+      end
+    end
+    
+    it 'should run any post deployment hooks' do        
+      WhiskeyDisk.should.receive(:run_post_deploy_hooks)
+      @rake["deploy:now"].invoke
+    end
+    
+    it 'should flush WhiskeyDisk changes' do
+      WhiskeyDisk.should.receive(:flush)
+      @rake["deploy:now"].invoke
+    end
+  end
+      
+  describe 'deploy:post_setup' do
+    it 'should run the defined post_setup rake task when a post_setup rake task is defined for this environment' do
+      @configuration = { 'environment' => 'production'}
+      WhiskeyDisk::Config.stub!(:fetch).and_return(@configuration)
+      WhiskeyDisk.reset      
+
+      task "deploy:production:post_setup" do
+        WhiskeyDisk.fake_method
+      end
+
+      WhiskeyDisk.should.receive(:fake_method)
+      Rake::Task['deploy:post_setup'].invoke
+    end
+
+    it 'should not fail when no post_setup rake task is defined for this environment' do
+      @configuration = { 'environment' => 'staging'}
+      WhiskeyDisk::Config.stub!(:fetch).and_return(@configuration)
+      WhiskeyDisk.reset      
+      lambda { Rake::Task['deploy:post_setup'].invoke }.should.not.raise
+    end
+  end
+  
+  describe 'deploy:post_deploy' do
+    it 'should run the defined post_deploy rake task when a post_deploy rake task is defined for this environment' do
+      @configuration = { 'environment' => 'production'}
+      WhiskeyDisk::Config.stub!(:fetch).and_return(@configuration)
+      WhiskeyDisk.reset      
+
+      task "deploy:production:post_deploy" do
+        WhiskeyDisk.fake_method
+      end
+
+      WhiskeyDisk.should.receive(:fake_method)
+      Rake::Task['deploy:post_deploy'].invoke
+    end
+
+    it 'should not fail when no post_deploy rake task is defined for this environment' do
+      @configuration = { 'environment' => 'staging'}
+      WhiskeyDisk::Config.stub!(:fetch).and_return(@configuration)
+      WhiskeyDisk.reset      
+      lambda { Rake::Task['deploy:post_deploy'].invoke }.should.not.raise
+    end
+  end
+end

data/spec/whiskey_disk_spec.rb

@@ -5,7 +5,7 @@ require 'rake'
 describe 'requiring the main library' do
   before do
     Rake.application = @rake = Rake::Application.new
-    load File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'tasks', 'deploy.rb'))
+    load File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'whiskey_disk', 'rake.rb'))
   end
 
   after do
@@ -22,6 +22,68 @@ describe 'requiring the main library' do
 end
 
 describe 'WhiskeyDisk' do
+  describe 'determining if the deployment is remote' do
+    before do
+      @parameters = { 'deploy_to' => '/path/to/main/repo' }
+      WhiskeyDisk::Config.stub!(:fetch).and_return(@parameters)
+      WhiskeyDisk.reset
+    end
+    
+    it 'should work without arguments' do
+      lambda { WhiskeyDisk.remote? }.should.not.raise(ArgumentError)
+    end
+    
+    it 'should not allow arguments' do
+      lambda { WhiskeyDisk.remote?(:foo) }.should.raise(ArgumentError)
+    end
+    
+    it 'should return true if the configuration includes a non-empty domain setting' do
+      @parameters['domain'] = 'smeghost'
+      WhiskeyDisk.remote?.should == true
+    end
+    
+    it 'should return false if the configuration includes a nil domain setting' do
+      @parameters['domain'] = nil
+      WhiskeyDisk.remote?.should == false
+    end
+    
+    it 'should return false if the configuration includes a blank domain setting' do
+      @parameters['domain'] = ''
+      WhiskeyDisk.remote?.should == false
+    end
+  end
+  
+  describe 'determining if the deployment has a configuration repository' do
+    before do
+      @parameters = { 'deploy_to' => '/path/to/main/repo' }
+      WhiskeyDisk::Config.stub!(:fetch).and_return(@parameters)
+      WhiskeyDisk.reset
+    end
+    
+    it 'should work without arguments' do
+      lambda { WhiskeyDisk.has_config_repo? }.should.not.raise(ArgumentError)
+    end
+    
+    it 'should not allow arguments' do
+      lambda { WhiskeyDisk.has_config_repo?(:foo) }.should.raise(ArgumentError)
+    end
+    
+    it 'should return true if the configuration includes a non-empty config_repository setting' do
+      @parameters['config_repository'] = 'git://foo.git'
+      WhiskeyDisk.has_config_repo?.should == true
+    end
+    
+    it 'should return false if the configuration includes a nil config_repository setting' do
+      @parameters['config_repository'] = nil
+      WhiskeyDisk.has_config_repo?.should == false
+    end
+    
+    it 'should return false if the configuration includes a blank config_repository setting' do
+      @parameters['config_repository'] = ''
+      WhiskeyDisk.has_config_repo?.should == false
+    end
+  end
+
   describe 'ensuring that the parent path for the main repository checkout is present' do
     before do
       @parameters = { 'deploy_to' => '/path/to/main/repo' }
@@ -98,22 +160,6 @@ describe 'WhiskeyDisk' do
     end
   end
   
-  describe 'installing a post-receive hook on the checked out main repository' do
-    before do
-      @parameters = { 'deploy_to' => '/path/to/main/repo' }
-      WhiskeyDisk::Config.stub!(:fetch).and_return(@parameters)
-      WhiskeyDisk.reset
-    end
-    
-    it 'should fail if the deployment path is not specified' do
-      WhiskeyDisk::Config.stub!(:fetch).and_return(@parameters.merge('deploy_to' => nil))
-      WhiskeyDisk.reset
-      lambda { WhiskeyDisk.install_hooks }.should.raise
-    end
-    
-    # FIXME -- TODO:  MORE HERE
-  end
-  
   describe 'checking out the configuration repository' do
     before do
       @parameters = { 'deploy_config_to' => '/path/to/config/repo', 'config_repository' => 'git@ogtastic.com:config.git' }
@@ -211,15 +257,29 @@ describe 'WhiskeyDisk' do
       WhiskeyDisk.buffer.join(' ').should.match(%r{cd /path/to/config/repo})
     end
     
-    it 'should attempt to fetch only the master branch from the origin' do
+    it 'should attempt to fetch only the master branch from the origin if no configuration branch is specified' do
       WhiskeyDisk.update_configuration_repository_checkout
       WhiskeyDisk.buffer.join(' ').should.match(%r{git fetch origin \+refs/heads/master:refs/remotes/origin/master})
     end
     
-    it 'should attempt to reset the master branch from the origin' do
+    it 'should attempt to fetch the specified branch from the origin if a configuration branch is specified' do
+      WhiskeyDisk::Config.stub!(:fetch).and_return(@parameters.merge({'config_branch' => 'production'}))
+      WhiskeyDisk.reset
+      WhiskeyDisk.update_configuration_repository_checkout
+      WhiskeyDisk.buffer.join(' ').should.match(%r{git fetch origin \+refs/heads/production:refs/remotes/origin/production})
+    end
+    
+    it 'should attempt to reset the master branch from the origin if no configuration branch is specified' do
       WhiskeyDisk.update_configuration_repository_checkout
       WhiskeyDisk.buffer.join(' ').should.match(%r{git reset --hard origin/master})
     end
+
+    it 'should attempt to reset the master branch from the origin if no configuration branch is specified' do
+      WhiskeyDisk::Config.stub!(:fetch).and_return(@parameters.merge({'config_branch' => 'production'}))
+      WhiskeyDisk.reset
+      WhiskeyDisk.update_configuration_repository_checkout
+      WhiskeyDisk.buffer.join(' ').should.match(%r{git reset --hard origin/production})
+    end
   end
   
   describe 'refreshing the configuration' do
@@ -244,6 +304,12 @@ describe 'WhiskeyDisk' do
       lambda { WhiskeyDisk.refresh_configuration }.should.raise
     end
     
+    it 'should fail if no project name was specified' do
+      WhiskeyDisk::Config.stub!(:fetch).and_return(@parameters.merge('project' => 'unnamed_project'))
+      WhiskeyDisk.reset
+      lambda { WhiskeyDisk.refresh_configuration }.should.raise      
+    end
+    
     it 'should use rsync to overlay the configuration checkout for the project in the configured environment onto the main checkout' do
       WhiskeyDisk.refresh_configuration
       WhiskeyDisk.buffer.last.should.match(%r{rsync.* /path/to/config/repo/whiskey_disk/production/ /path/to/main/repo/})

data/tasks/deploy.rake

@@ -1,2 +1,2 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'tasks', 'deploy'))
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'whiskey_disk', 'rake'))
 

data/whiskey_disk.gemspec

@@ -0,0 +1,76 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{whiskey_disk}
+  s.version = "0.3.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Rick Bradley"]
+  s.date = %q{2010-06-17}
+  s.default_executable = %q{wd}
+  s.description = %q{Opinionated gem for doing fast git-based server deployments.}
+  s.email = %q{rick@rickbradley.com}
+  s.executables = ["wd"]
+  s.extra_rdoc_files = [
+    "README"
+  ]
+  s.files = [
+    ".gitignore",
+     "MIT-LICENSE",
+     "README",
+     "Rakefile",
+     "TODO.txt",
+     "VERSION",
+     "WHY.txt",
+     "bin/wd",
+     "examples/deploy-staging.yml",
+     "examples/deploy.rake",
+     "examples/deploy.yml",
+     "init.rb",
+     "install.rb",
+     "lib/whiskey_disk.rb",
+     "lib/whiskey_disk/config.rb",
+     "lib/whiskey_disk/rake.rb",
+     "spec/.bacon",
+     "spec/init_spec.rb",
+     "spec/install_spec.rb",
+     "spec/spec_helper.rb",
+     "spec/wd_command_spec.rb",
+     "spec/whiskey_disk/config_spec.rb",
+     "spec/whiskey_disk/rake_spec.rb",
+     "spec/whiskey_disk_spec.rb",
+     "tasks/deploy.rake",
+     "whiskey_disk.gemspec"
+  ]
+  s.homepage = %q{http://github.com/flogic/whiskey_disk}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{embarrassingly fast deployments.}
+  s.test_files = [
+    "spec/init_spec.rb",
+     "spec/install_spec.rb",
+     "spec/spec_helper.rb",
+     "spec/wd_command_spec.rb",
+     "spec/whiskey_disk/config_spec.rb",
+     "spec/whiskey_disk/rake_spec.rb",
+     "spec/whiskey_disk_spec.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<rake>, [">= 0"])
+    else
+      s.add_dependency(%q<rake>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<rake>, [">= 0"])
+  end
+end
+

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: whiskey_disk
 version: !ruby/object:Gem::Version 
-  version: 0.0.7
+  hash: 19
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Rick Bradley
@@ -9,23 +15,27 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-31 00:00:00 +05:30
-default_executable: 
+date: 2010-06-17 00:00:00 -05:00
+default_executable: wd
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 description: Opinionated gem for doing fast git-based server deployments.
 email: rick@rickbradley.com
-executables: []
-
+executables: 
+- wd
 extensions: []
 
 extra_rdoc_files: 
@@ -38,22 +48,25 @@ files:
 - TODO.txt
 - VERSION
 - WHY.txt
+- bin/wd
 - examples/deploy-staging.yml
 - examples/deploy.rake
 - examples/deploy.yml
 - init.rb
 - install.rb
-- lib/tasks/deploy.rb
 - lib/whiskey_disk.rb
 - lib/whiskey_disk/config.rb
+- lib/whiskey_disk/rake.rb
 - spec/.bacon
 - spec/init_spec.rb
 - spec/install_spec.rb
 - spec/spec_helper.rb
-- spec/tasks/deploy_spec.rb
+- spec/wd_command_spec.rb
 - spec/whiskey_disk/config_spec.rb
+- spec/whiskey_disk/rake_spec.rb
 - spec/whiskey_disk_spec.rb
 - tasks/deploy.rake
+- whiskey_disk.gemspec
 has_rdoc: true
 homepage: http://github.com/flogic/whiskey_disk
 licenses: []
@@ -64,21 +77,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: embarrassingly fast deployments.
@@ -86,6 +105,7 @@ test_files:
 - spec/init_spec.rb
 - spec/install_spec.rb
 - spec/spec_helper.rb
-- spec/tasks/deploy_spec.rb
+- spec/wd_command_spec.rb
 - spec/whiskey_disk/config_spec.rb
+- spec/whiskey_disk/rake_spec.rb
 - spec/whiskey_disk_spec.rb

data/lib/tasks/deploy.rb

@@ -1,37 +0,0 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'whiskey_disk'))
-require 'rake'
-
-namespace :deploy do
-  desc "Perform initial setup for deployment"
-  task :setup do
-    WhiskeyDisk.ensure_main_parent_path_is_present        if WhiskeyDisk.remote?
-    WhiskeyDisk.ensure_config_parent_path_is_present     
-    WhiskeyDisk.checkout_main_repository                  if WhiskeyDisk.remote?
-    WhiskeyDisk.install_hooks                             if WhiskeyDisk.remote?
-    WhiskeyDisk.checkout_configuration_repository
-    WhiskeyDisk.update_main_repository_checkout           if WhiskeyDisk.remote?
-    WhiskeyDisk.update_configuration_repository_checkout
-    WhiskeyDisk.refresh_configuration
-    WhiskeyDisk.run_post_setup_hooks
-    WhiskeyDisk.flush
-  end
-  
-  desc "Deploy now."
-  task :now do
-    WhiskeyDisk.update_main_repository_checkout           if WhiskeyDisk.remote?
-    WhiskeyDisk.update_configuration_repository_checkout
-    WhiskeyDisk.refresh_configuration
-    WhiskeyDisk.run_post_deploy_hooks
-    WhiskeyDisk.flush
-  end
-  
-  task :post_setup do
-    env = WhiskeyDisk[:environment]
-    Rake::Task["deploy:#{env}:post_setup"].invoke if Rake::Task.task_defined? "deploy:#{env}:post_setup"      
-  end
-
-  task :post_deploy do
-    env = WhiskeyDisk[:environment]
-    Rake::Task["deploy:#{env}:post_deploy"].invoke if Rake::Task.task_defined? "deploy:#{env}:post_deploy"      
-  end
-end