whiskey_disk 0.6.10 → 0.6.11

data/CHANGELOG

@@ -1,9 +1,13 @@
 
+0.6.11 / 2011-02-18 
+==================
+
+  * Generate an error message when we can't find --to proj/env in a config
+  * Fixing typo in an integration spec's example text
+
 0.6.10 / 2011-02-08 
 ==================
 
-  * bump version to 0.6.10
-  * Merge branch 'feature/improved-integration-specs' into develop
   * reorganizing integration specs
   * adding a quick README on how to run integration specs
   * adding a remote deployment integration spec
@@ -13,50 +17,29 @@
   * fixing 'unit@' --only local deployment WD.remote? bug
   * Adding initial integration spec suite
   * save +x chmod state to bin/wd
-  * Merge branch 'develop' of git.ogtastic.com:whiskey_disk into develop
-  * Merge branch 'hotfix/cd-before-post-scripts' into develop
   * adding --only support to wd binary
   * an ENV['only'] domain should deploy locally
   * adding support for ENV['none'] to WhiskeyDisk, ::Config
-  * updating README to document upcoming --only / ENV['only'] functionality
   * WD.fetch now iterates over all domains, local or remote
   * reorganizing specs
   * make it an error for a domain to appear more than once in a given project/target
   * changing internal :domain representation
   * WhiskeyDisk.remote? now takes a domain argument
-  * README updates for specifying local deployments via "local" domain
-  * added tl;dr quickstart section to README
-  * Merge branch 'feature/enable_pulling_deploy.yml_from_url' into develop
-  * updating README to describe using --path URLs
   * can now specify path to deploy.yml info using an URL
-  * Merge branch 'feature/move_todo_to_pivotal_tracker' into develop
-  * removing TODO.txt
-  * updating README to point to PT project instead of old TODO.txt file
 
 0.6.4 / 2011-01-26 
 ==================
 
   * bugfix: cd to deploy_to path before running post_{setup,deploy}_script
-  * update gemspec
-  * Version bump to 0.6.4
 
 0.6.3 / 2011-01-13 
 ==================
 
   * adding support for config_target in deploy.yml
-  * updating README for upcoming config_target support
-  * bumping version to 0.6.3
 
 0.6.2 / 2010-12-23 
 ==================
 
-  * bumping version to 0.6.2
-  * Merge branch 'feature/support-domain-roles' into develop
-  * updating README to document new roles functionality
-  * even more README tweaks
-  * more README tweaks
-  * adding lib/tasks/deploy.rake example to README
-  * refreshing gemspec
   * update multiple deployment example to use roles
   * new wd_role command for checking membership in a role from shell scripts
   * adding #role? method in whiskey_disk/helpers for role-based rake tasks
@@ -72,12 +55,9 @@
 0.6.0 / 2010-12-22 
 ==================
 
-  * Version bump to 0.6.0
-  * Merge branch 'feature/multiple-domain-support' into develop
   * adding a set of multi-domain examples
   * adding a local deployment example
   * updating output summary to be more readable
-  * updating README to document multi-domain deployments
   * rake exit statuses reflect overall deployment/setup success
   * adding WhiskeyDisk.success? method
   * We now summarize runs, both local and remote.
@@ -91,11 +71,7 @@
 0.5.4
 ==================
 
-  * Merge branch 'release/0.5.4' into develop
-  * bump gemspec for 0.5.4 release
-  * Version bump to 0.5.4
   * Removing Jeweler warning from Rakefile
-  * Merge branch 'feature/reduce-mocking-code-in-tests' into develop
   * eliminating more stubbing specs from config_spec
   * Removing more stub! calls from config specs
   * removing YAML.load exception stub
@@ -115,11 +91,6 @@
 0.5.3
 ==================
 
-  * Merge branch 'release/0.5.3' into develop
-  * updating gemspec for 0.5.3
-  * updating Contributors section of README
-  * Version bump to 0.5.3
-  * Merge branch 'feature/merge-pull-request-2' into develop
   * Cosmetic and naming change in new config method
   * fixing spec example description
   * Reworking the config to append project name overrides to the env, since everything else is dependent thereupon
@@ -129,44 +100,21 @@
 0.5.2
 ==================
 
-  * Merge branch 'release/0.5.2' into develop
-  * updating gemspec for version 0.5.2
-  * Bumping version to 0.5.2
-  * Merge branch 'feature/ensure_target_needs_no_ruby' into develop
-  * Updating TODO list
-  * Updating README
-  * Merge branch 'feature/make_check_a_wd_option' into develop
-  * Updating TODO list
   * Adding --check flag to wd command-line script
-  * Updating README with --check changes
-  * Merge branch 'feature/use_shallow_clone_on_setup' into develop
-  * Updating TODO list
-  * Adding lightning talk info to README
   * Making shallow clones on initial setup
 
 0.5.0
 ==================
 
-  * Merge branch 'release/0.5.0' into develop
-  * updating gemspec for 0.5.0
-  * Version bump to 0.5.0
-  * Merge branch 'feature/alternate-hook-mechanism' into develop
-  * TODO list updates
   * Make the rake test task do right by bacon
   * Adding post_setup_script support
   * Adding post_deploy_script support
   * Reordering specs for post-setup/deployment tasks
-  * Updating README for post_*_script functionality
-  * TODO file updates
 
 0.4.5
 ==================
 
-  * Merge branch 'release/0.4.5' into develop
-  * new gemspec for 0.4.5 release
-  * Version bump to 0.4.5
   * ENV settings now available to rake when searching for tasks
-  * Merge branch 'feature/refactor-methods' into develop
   * refactoring common code for rake tasks
   * further refactoring of clone_repository
   * refactoring update checkout methods
@@ -176,68 +124,38 @@
 0.4.4
 ==================
 
-  * Merge branch 'release/0.4.4' into develop
-  * 0.4.4 gemspec
-  * Version bump to 0.4.4
-  * Merge branch 'feature/readme-updates' into develop
-  * TODO list tweakage
   * README updates
 
 0.4.3
 ==================
 
-  * Merge branch 'release/0.4.3' into develop
-  * updating gemspec
-  * Version bump to 0.4.3
-  * Updating TODO
   * Smarter setups
-  * TODO updates
 
 0.4.2
 ==================
 
-  * Version bump to 0.4.2
   * Taking a different approach to rake task detection
 
 0.4.1
 ==================
 
-  * bumping gemspec
-  * Version bump to 0.4.1
   * Fixing post_* hook edge case
-  * More README updates
-  * updating README
 
 0.4.0
 ==================
 
-  * updated gemspec
-  * adding staleness check docs to README
-  * Version bump to 0.4.0
   * Make the staleness check actually work with bash.
   * Adding "else" block to provide feedback when not stale
   * More complete implementation of staleness checks
   * Removing earlier abortive implementation of staleness checking
   * Support for staleness checks
   * Adding first pass at conditional staleness checks
-  * updating TODO list
-  * README note about post_* rake task dependencies
 
 0.3.1
 ==================
 
-  * updated gemspec
-  * Version bump to 0.3.1
   * No longer require a Rakefile when --path isn't used
   * We no longer do per-target config file overrides
   * Don't run post_{setup,deploy} rake tasks without a deployed Rakefile
-  * use 'target' instead of 'environment' in README
   * encoding < and >
-  * more README tweaks
-  * readme formatting tweak
-  * make sure README.markdown is displayed on install
-  * new and improved README
-  * adding a simple deploy.yml example to the README
-  * add link to live presentation to README
   * adding a check flag for use with staleness checks
-  * english spike of staleness check in todo file

data/README.markdown

@@ -767,6 +767,7 @@ to see what we have in mind for the near future.
 ### Contributors ###
 
  - Rick Bradley (rick@rickbradley.com, github:rick)
+ - Alex Sharp (ajsharp@gmail.com) - issues, real-world usage cases, design feedback
  - Jeremy Holland (jeremy@jeremypholland.com, github:therubyneck): feature/bugfix contributions
  - Kevin Barnes (@vinbarnes), Yossef Mendellsohn (cardioid) for design help and proofreading
  - Cristi Balan (evilchelu) for feedback and proofreading

data/VERSION

@@ -1 +1 @@
-0.6.10
+0.6.11

data/lib/whiskey_disk/config.rb

@@ -171,8 +171,8 @@ class WhiskeyDisk
       end
 
       def filter_data(data)
-        current = data[project_name][environment_name]
-        raise "No configuration file defined data for environment [#{environment_name}]" unless current
+        current = data[project_name][environment_name] rescue nil
+        raise "No configuration file defined data for project `#{project_name}`, environment `#{environment_name}`" unless current
 
         current.merge!({
           'environment' => environment_name,

data/spec/integration/deployment_failures_spec.rb

@@ -0,0 +1,106 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper.rb'))
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'lib', 'whiskey_disk'))
+
+integration_spec do  
+  describe 'when specified project cannot be found in the configuration' do
+    before do
+      setup_deployment_area
+      
+      @config = scenario_config('remote/deploy.yml')
+      @args = "--path=#{@config} --to=bogus:remote"
+    end
+
+    describe 'and performing a setup' do
+      it 'should not checkout a repository for the project to the target path' do
+        run_setup(@args)
+        File.exists?(deployed_file('bogus')).should == false
+      end
+      
+      it 'should not checkout a repository for any project in the configuration file to the target path' do
+        run_setup(@args)
+        File.exists?(deployed_file('project')).should == false
+      end
+      
+      it 'should include a helpful error message' do
+        run_setup(@args)
+        File.read(integration_log).should =~ /No configuration file defined data for project `bogus`/
+      end
+      
+      it 'should exit with a false status' do
+        run_setup(@args).should == false
+      end
+    end
+
+    describe 'and performing a deployment' do
+      before do
+        checkout_repo('project')
+        File.unlink(deployed_file('project/README'))  # modify the deployed checkout
+      end        
+
+      it 'should not checkout a repository for the project to the target path' do
+        run_deploy(@args)
+        File.exists?(deployed_file('bogus')).should == false
+      end
+      
+      it 'should not update the repository for any project in the configuration file to the target path' do
+        run_deploy(@args)
+        File.exists?(deployed_file('project/README')).should == false
+      end
+      
+      it 'should include a helpful error message' do
+        run_deploy(@args)
+        File.read(integration_log).should =~ /No configuration file defined data for project `bogus`/
+      end
+      
+      it 'should exit with a false status' do
+        run_deploy(@args).should == false
+      end
+    end
+  end
+  
+  describe 'when specified environment cannot be found in the configuration' do
+    before do
+      setup_deployment_area
+      
+      @config = scenario_config('remote/deploy.yml')
+      @args = "--path=#{@config} --to=project:bogus"
+    end
+
+    describe 'and performing a setup' do
+      it 'should not checkout a repository for the project to the target path' do
+        run_setup(@args)
+        File.exists?(deployed_file('project')).should == false
+      end
+      
+      it 'should include a helpful error message' do
+        run_setup(@args)
+        File.read(integration_log).should =~ /No configuration file defined data for project `project`, environment `bogus`/
+      end
+      
+      it 'should exit with a false status' do
+        run_setup(@args).should == false
+      end
+    end
+
+    describe 'and performing a deployment' do
+      before do
+        checkout_repo('project')
+        File.unlink(deployed_file('project/README'))  # modify the deployed checkout
+      end        
+
+      it 'should not update the repository for the project to the target path' do
+        run_deploy(@args)
+        File.exists?(deployed_file('project/README')).should == false
+      end
+      
+      it 'should include a helpful error message' do
+        run_deploy(@args)
+        File.read(integration_log).should =~ /No configuration file defined data for project `project`, environment `bogus`/
+      end
+      
+      it 'should exit with a false status' do
+        run_deploy(@args).should == false
+      end
+    end
+  end
+end

data/spec/integration/remote_deployments_spec.rb

@@ -40,7 +40,7 @@ integration_spec do
           File.exists?(deployed_file('project/README')).should == true
         end    
 
-        it 'should report the remoate deployment as successful' do
+        it 'should report the remote deployment as successful' do
           run_deploy(@args)
           File.read(integration_log).should =~ /wd-app1.example.com => succeeded/
         end

data/spec/whiskey_disk/config_spec.rb

@@ -191,6 +191,11 @@ describe WhiskeyDisk::Config do
         set_config_url_response('production' => { 'repository' => 'b'}, 'staging' => staging)
         TestURLConfig.fetch['config_target'].should == 'testing'
       end
+      
+      it 'should fail if the named target cannot be found' do
+        ENV['to'] = @env = 'bogus:thing'
+        lambda { TestURLConfig.fetch }.should.raise
+      end
     end
     
     describe 'and path specified is not an URL' do
@@ -203,7 +208,7 @@ describe WhiskeyDisk::Config do
       after do
         FileUtils.rm_rf(@path)
       end
-
+      
       it 'should fail if the current environment cannot be determined' do
         ENV['to'] = nil
         lambda { WhiskeyDisk::Config.fetch }.should.raise
@@ -285,6 +290,11 @@ describe WhiskeyDisk::Config do
         write_config_file('production' => { 'repository' => 'b'}, 'staging' => staging)
         WhiskeyDisk::Config.fetch['config_target'].should == 'testing'
       end
+      
+      it 'should fail if the named target cannot be found' do
+        ENV['to'] = @env = 'bogus:thing'
+        lambda { WhiskeyDisk::Config.fetch }.should.raise
+      end
     end
   end
 

data/whiskey_disk.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{whiskey_disk}
-  s.version = "0.6.10"
+  s.version = "0.6.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rick Bradley"]
-  s.date = %q{2011-02-08}
+  s.date = %q{2011-02-20}
   s.description = %q{Opinionated gem for doing fast git-based server deployments.}
   s.email = %q{rick@rickbradley.com}
   s.executables = ["wd_role", "wd"]
@@ -87,6 +87,7 @@ Gem::Specification.new do |s|
     "spec/.bacon",
     "spec/init_spec.rb",
     "spec/install_spec.rb",
+    "spec/integration/deployment_failures_spec.rb",
     "spec/integration/invalid_configuration_spec.rb",
     "spec/integration/local_deployments_spec.rb",
     "spec/integration/remote_deployments_spec.rb",
@@ -107,6 +108,7 @@ Gem::Specification.new do |s|
   s.test_files = [
     "spec/init_spec.rb",
     "spec/install_spec.rb",
+    "spec/integration/deployment_failures_spec.rb",
     "spec/integration/invalid_configuration_spec.rb",
     "spec/integration/local_deployments_spec.rb",
     "spec/integration/remote_deployments_spec.rb",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: whiskey_disk
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 6
-  - 10
-  version: 0.6.10
+  - 11
+  version: 0.6.11
 platform: ruby
 authors: 
 - Rick Bradley
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-08 00:00:00 -06:00
+date: 2011-02-20 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -112,6 +112,7 @@ files:
 - spec/.bacon
 - spec/init_spec.rb
 - spec/install_spec.rb
+- spec/integration/deployment_failures_spec.rb
 - spec/integration/invalid_configuration_spec.rb
 - spec/integration/local_deployments_spec.rb
 - spec/integration/remote_deployments_spec.rb
@@ -161,6 +162,7 @@ summary: embarrassingly fast deployments.
 test_files: 
 - spec/init_spec.rb
 - spec/install_spec.rb
+- spec/integration/deployment_failures_spec.rb
 - spec/integration/invalid_configuration_spec.rb
 - spec/integration/local_deployments_spec.rb
 - spec/integration/remote_deployments_spec.rb