whiskey_disk 0.6.22 → 0.6.23

data/scenarios/git_repositories/project.git/objects/04/f4de85eaf72ef1631dc6d7424045c0a749b757

@@ -0,0 +1 @@
+x
��IjC1D��)zH�<@!G����#����:��>2��7Uԃ���5��

data/scenarios/git_repositories/project.git/objects/20/1c7641c2e42b0b904e5c1f793489d8b858e4da

@@ -0,0 +1,2 @@
+x
���	1D�Nۀ��%qD�� ��a�r�?���u���<x3���;hr��D@��mr�h68sZğ��D�7�»?k�G�/���V����v�ż�S��
+ڰ7nb�pDBT���.�*o��¾���<t

data/scenarios/git_repositories/project.git/objects/27/a3fff2c4c45ab5513a405f694c0a042cb5d417

@@ -0,0 +1 @@
+x
�NAj1�ٯ�s�ev��g!��'�ab���l�:����A/BR\��4 Go��Bq +C΄ѻ�)N,["�c����`�R��`�J8Z��	��9'�#���s�#s�`��.k�c�3������v���������oYdxG�h��O6�g�HJ��

data/scenarios/git_repositories/project.git/objects/2c/0c33cfba8e1af15df88522c0db2b10a6a94138

@@ -0,0 +1,2 @@
+x
��Kj1D��)�	R�3#I�|
�j��C2��"������z��mYfL��MŁJ�$`≳��x��G�\�(H���dUȑs�Tsq��m�.
+^m���8��n��m��W�:�ط���+����w�n�
(�V}

data/scenarios/git_repositories/project.git/objects/5b/a96acf9cc9b87babe37c032676f53bf1ba9ae7

@@ -0,0 +1,2 @@
+x
��aj� ��������Q�Rz��@�	��b4���ޠ�x����<��t g/��@Wmf�&�Dɧ��3���N�8�ɜ�Ol�u�&8��2�m`��l�(&�&+�z���������j19��F�|Zz�w��h��'D��
+U6

data/scenarios/git_repositories/project.git/objects/86/d1ef0976be4567de562224e1b51fbf9820c53a

@@ -0,0 +1 @@
+x
��AJ1E]��P��J:
�^@�J���4If��x7���뾗
��a40�I�т.�b��F���7Bi�N4[u�&���Ցa¤S�$�Ͷ��|�>y�rT�>>k���7xk1�7<��^'��'������vZ�Ig��*�\�+����tn���S�!�G��S���\T�

data/scenarios/git_repositories/project.git/objects/95/c9d5ad9b1c90e4c805516783105fc2037dedeb

@@ -0,0 +1,2 @@
+x
��Kn� ����U�# ��TUUw��
+���M����|&�z

data/scenarios/git_repositories/project.git/objects/95/d82d043af35a80eabfd56c0d705abfa3488787

@@ -0,0 +1,2 @@
+x
��Qn1D��S�Ev�d	UG�I�@�.�B���7��3�yғ&o�Z;XG������$:+i���y)��ZJ����=6�
+�e�?8�����^d������<3|�C4���]��M��3D(�.�v�W-uQ(�R���������RR�

data/scenarios/git_repositories/project.git/objects/a3/860106dc1d148c7831cd45ae38829b4ed47702

@@ -0,0 +1,2 @@
+x
��]
+�0�}�)��6ɚD�#x��l�h�"�ۛ�

data/scenarios/git_repositories/project.git/objects/ae/3900de54aff557c61c81146d00f9d38e55a265

@@ -0,0 +1 @@
+x
��Aj!E���H(�R[B��������I���!7���{�৶�u���4z���J"���d

data/scenarios/git_repositories/project.git/objects/bf/5e3740d52b80abb0378b3f85f93a53b1294521

@@ -0,0 +1 @@
+x
��Qj�0�S�v�X� ��#���*��"�߾*�A~����e��v����B&��ls}a8{"B�.�Oα�c5��t8'%qP�BC.=�]�d!{�gr���v_|Uy��q~������˜d�>�Z�1�GM���o�s��

data/scenarios/git_repositories/project.git/objects/cc/5ac0afb24e727d5de344cc26a425f4fb7fd17d

@@ -0,0 +1,3 @@
+x
��A
+�0D]�C�BBAWz��NJI�G�6?𓅷�$�Y���7oy�f�])g&on�֒�
+F^h�B���D��t�
������ htt.e�%�y���CΪ�V���f��S�~��?�Z�v�w�ΰҭl:�l?k�]�

data/scenarios/git_repositories/project.git/objects/db/d1b9667f1b26b13331ac0c321dced8be1aeab0

@@ -0,0 +1,3 @@
+x
��Kj�0��)�	-Y�$��@h�Zc3c���bn�� �����n�����ԛ�T&�RpL���`0��O���g�tT5هh*��l%��D]��2Z��e������+��Q��.m���I���
+��yv:Z�g�j��基����
+G=�W��^��z;�W�rv�����7�dTf�ݺV�

data/scenarios/git_repositories/project.git/refs/heads/bad_rakefile

@@ -0,0 +1 @@
+95d82d043af35a80eabfd56c0d705abfa3488787

data/scenarios/git_repositories/project.git/refs/heads/hook_with_changed

@@ -0,0 +1 @@
+5ba96acf9cc9b87babe37c032676f53bf1ba9ae7

data/scenarios/git_repositories/project.git/refs/heads/master

@@ -0,0 +1 @@
+04f4de85eaf72ef1631dc6d7424045c0a749b757

data/scenarios/git_repositories/project.git/refs/heads/no_rake_hooks

@@ -0,0 +1 @@
+ae3900de54aff557c61c81146d00f9d38e55a265

data/scenarios/git_repositories/project.git/refs/heads/post_rake_tasks

@@ -0,0 +1 @@
+27a3fff2c4c45ab5513a405f694c0a042cb5d417

data/scenarios/invalid/deploy.yml

@@ -0,0 +1 @@
+}

data/scenarios/local/deploy.yml.erb

@@ -0,0 +1,17 @@
+<% root = File.expand_path(File.join(File.dirname(__FILE__), 'scenarios', 'setup', 'vagrant', 'deployed', 'target')) %>
+project:
+  "local-default":
+    deploy_to: "<%= root %>/project"
+    repository: "git://localhost/project.git"
+  "local-keyword":
+    domain: "local"
+    deploy_to: "<%= root %>/project"
+    repository: "git://localhost/project.git"
+  "local-user-domain":
+    domain: "user@localhost"
+    deploy_to: "<%= root %>/project"
+    repository: "git://localhost/project.git"
+  "local-domain":
+    domain: "localhost"
+    deploy_to: "<%= root %>/project"
+    repository: "git://localhost/project.git"

data/scenarios/remote/deploy.yml

@@ -0,0 +1,119 @@
+project:
+  "remote":
+    domain:
+    - name: "vagrant@vagrant"
+      ssh_options:
+      - "-F"
+      - "scenarios/setup/vagrant/ssh_config"
+    deploy_to: "/opt/deploy/target/project"
+    repository: "git://wd-git.example.com/project.git"
+  "remote-on-other-branch":
+    domain:
+    - name: "vagrant@vagrant"
+      ssh_options:
+      - "-F"
+      - "scenarios/setup/vagrant/ssh_config"
+    deploy_to: "/opt/deploy/target/project"
+    repository: "git://wd-git.example.com/project.git"
+    branch: "no_rake_hooks"
+  "no_rakefile":
+    domain:
+    - name: "vagrant@vagrant"
+      ssh_options:
+      - "-F"
+      - "scenarios/setup/vagrant/ssh_config"
+    deploy_to: "/opt/deploy/target/project"
+    repository: "git://wd-git.example.com/project.git"
+  "bad_rakefile":
+    domain:
+    - name: "vagrant@vagrant"
+      ssh_options:
+      - "-F"
+      - "scenarios/setup/vagrant/ssh_config"
+    deploy_to: "/opt/deploy/target/project"
+    repository: "git://wd-git.example.com/project.git"
+    branch: "bad_rakefile"
+  "no_rake_hooks":
+    domain:
+    - name: "vagrant@vagrant"
+      ssh_options:
+      - "-F"
+      - "scenarios/setup/vagrant/ssh_config"
+    deploy_to: "/opt/deploy/target/project"
+    repository: "git://wd-git.example.com/project.git"
+    branch: "no_rake_hooks"
+  "with_rake_hooks":
+    domain:
+    - name: "vagrant@vagrant"
+      ssh_options:
+      - "-F"
+      - "scenarios/setup/vagrant/ssh_config"
+    deploy_to: "/opt/deploy/target/project"
+    repository: "git://wd-git.example.com/project.git"
+    branch: "post_rake_tasks"
+  "no_post_scripts":
+    domain:
+    - name: "vagrant@vagrant"
+      ssh_options:
+      - "-F"
+      - "scenarios/setup/vagrant/ssh_config"
+    deploy_to: "/opt/deploy/target/project"
+    repository: "git://wd-git.example.com/project.git"
+  "missing_post_scripts":
+    domain:
+    - name: "vagrant@vagrant"
+      ssh_options:
+      - "-F"
+      - "scenarios/setup/vagrant/ssh_config"
+    deploy_to: "/opt/deploy/target/project"
+    repository: "git://wd-git.example.com/project.git"
+    post_setup_script: "bin/missing.sh"
+    post_deploy_script: "bin/missing.sh"
+    rake_env:
+      FOO: "BAR"
+  "with_post_scripts":
+    domain:
+    - name: "vagrant@vagrant"
+      ssh_options:
+      - "-F"
+      - "scenarios/setup/vagrant/ssh_config"
+    deploy_to: "/opt/deploy/target/project"
+    repository: "git://wd-git.example.com/project.git"
+    post_setup_script: "bin/post_setup_script.sh"
+    post_deploy_script: "bin/post_deploy_script.sh"
+    rake_env:
+      FOO: "BAR"
+  "with_failing_post_scripts":
+    domain:
+    - name: "vagrant@vagrant"
+      ssh_options:
+      - "-F"
+      - "scenarios/setup/vagrant/ssh_config"
+    deploy_to: "/opt/deploy/target/project"
+    repository: "git://wd-git.example.com/project.git"
+    post_setup_script: "bin/failing_post_setup_script.sh"
+    post_deploy_script: "bin/failing_post_deploy_script.sh"
+    rake_env:
+      FOO: "BAR"
+  "hook_with_changed":
+    domain:
+    - name: "vagrant@vagrant"
+      ssh_options:
+      - "-F"
+      - "scenarios/setup/vagrant/ssh_config"
+    deploy_to: "/opt/deploy/target/project"
+    repository: "git://wd-git.example.com/project.git"
+    deploy_config_to: "/opt/deploy/target/config"
+    config_repository: "git://wd-git.example.com/config.git"
+    branch: "hook_with_changed"
+  "with_ssh_options":
+    domain:
+    - name: "vagrant@vagrant"
+      ssh_options:
+      - "-F"
+      - "scenarios/setup/vagrant/ssh_config"
+      - "-t"
+      - "-v"
+    deploy_to: "/tmp/wd-integration-target/destination/project"
+    repository: "git://wd-git.example.com/project.git"
+

data/scenarios/setup/vagrant/.gitignore

@@ -0,0 +1,3 @@
+ssh_config
+.vagrant
+deployed

data/scenarios/setup/vagrant/Vagrantfile

@@ -0,0 +1,10 @@
+Vagrant::Config.run do |config|
+  config.vm.box = "base"
+  config.vm.share_folder "deployment", "/opt/deploy", "deployed"
+  config.vm.share_folder "wd_lib", "/opt/lib", "../../../lib"
+
+  config.vm.provision :puppet do |puppet|
+    puppet.manifests_path = "manifests"
+    puppet.manifest_file = "integration.pp"
+  end
+end

data/scenarios/setup/vagrant/manifests/integration.pp

@@ -0,0 +1,32 @@
+file { '/etc/motd':
+  content => "Welcome to your Vagrant-built virtual machine! Managed by Puppet.\n"
+}
+
+file { '/opt/deploy/target':
+  ensure => directory,
+  owner => 'vagrant',
+  group => 'vagrant',
+  mode => '775'
+}
+
+file { '/home/vagrant/.bashrc':
+  ensure => 'present',
+  owner => 'vagrant',
+  group => 'vagrant',
+  mode => '755',
+  content => 'RUBYLIB="/opt/lib"; export RUBYLIB'
+}
+
+host {'host':
+  ensure       => 'present',
+  host_aliases => 'wd-git.example.com',
+  ip           => '10.0.2.2',
+}
+
+package {'git-core':
+  ensure       => 'latest'
+}
+
+package {'rake':
+  ensure       => 'latest'
+}

data/scenarios/setup/vagrant/pids/.gitignore

@@ -0,0 +1 @@
+*.pid

data/spec/init_spec.rb

@@ -2,7 +2,7 @@ require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper.rb'))
 require 'rake'
 
 describe 'when the init.rb plugin loader has been included' do
-  it 'should load the main library' do
+  it 'loads the main library' do
     require(File.expand_path(File.join(File.dirname(__FILE__), '..', 'init')))
     $".should.include(File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'whiskey_disk.rb')))
   end

data/spec/install_spec.rb

@@ -16,24 +16,24 @@ describe 'the plugin install.rb script' do
   end
   
   describe 'readme_contents' do
-    it 'should work without arguments' do
+    it 'works without arguments' do
       do_install
       lambda { readme_contents }.should.not.raise(ArgumentError)
     end
     
-    it 'should accept no arguments' do
+    it 'accepts no arguments' do
       do_install
       lambda { readme_contents(:foo) }.should.raise(ArgumentError)
     end
     
-    it 'should read the plugin README file' do
+    it 'reads the plugin README file' do
       do_install
       File.stub!(:join).and_return('/path/to/README')
       IO.should.receive(:read).with('/path/to/README')
       readme_contents
     end
     
-    it 'should return the contents of the plugin README file' do
+    it 'returns the contents of the plugin README file' do
       do_install
       File.stub!(:join).and_return('/path/to/README')
       IO.stub!(:read).with('/path/to/README').and_return('README CONTENTS')

data/spec/integration/branch_switching_spec.rb

@@ -0,0 +1,41 @@
+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 configured for a remote deployment' do
+    before do
+      setup_deployment_area
+    end
+  
+    describe 'and deploying on a different branch than originally deployed' do
+      before do
+        @config = scenario_config('remote/deploy.yml')
+        @args = "--path=#{@config} --to=project:remote"
+        run_setup(@args)
+        run_deploy(@args)
+
+        @args = "--path=#{@config} --to=project:remote-on-other-branch"
+        File.unlink(deployed_file('project/README'))  # modify the deployed checkout
+      end
+      
+      it 'updates the checkout of the repository on the target path' do
+        run_deploy(@args)
+        File.exists?(deployed_file('project/README')).should == true
+      end    
+
+      it 'has the working copy set to the new branch' do
+        run_deploy(@args)
+        current_branch('project').should == 'no_rake_hooks'
+      end
+
+      it 'reports the remote deployment as successful' do
+        run_deploy(@args)
+        File.read(integration_log).should =~ /vagrant => succeeded/
+      end
+
+      it 'exits with a true status' do
+        run_deploy(@args).should == true
+      end
+    end
+  end
+end

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 'does not checkout a repository for the project to the target path' do
+        run_setup(@args)
+        File.exists?(deployed_file('bogus')).should == false
+      end
+      
+      it 'does 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 'includes a helpful error message' do
+        run_setup(@args)
+        File.read(integration_log).should =~ /No configuration file defined data for project `bogus`/
+      end
+      
+      it 'exits 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 'does not checkout a repository for the project to the target path' do
+        run_deploy(@args)
+        File.exists?(deployed_file('bogus')).should == false
+      end
+      
+      it 'does 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 'includes a helpful error message' do
+        run_deploy(@args)
+        File.read(integration_log).should =~ /No configuration file defined data for project `bogus`/
+      end
+      
+      it 'exits 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 'does not checkout a repository for the project to the target path' do
+        run_setup(@args)
+        File.exists?(deployed_file('project')).should == false
+      end
+      
+      it 'includes 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 'exits 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 'does 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 'includes 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 'exits with a false status' do
+        run_deploy(@args).should == false
+      end
+    end
+  end
+end