whiskey_disk 0.0.3 → 0.0.5

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.5

data/lib/tasks/deploy.rb

@@ -9,6 +9,8 @@ namespace :deploy do
     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

data/lib/whiskey_disk/config.rb

@@ -41,7 +41,7 @@ class WhiskeyDisk
       
       def project_name(config)
         return '' unless config['repository'] and config['repository'] != ''
-        config['repository'].sub(%r{^.*/}, '').sub(%r{\.git$}, '')
+        config['repository'].sub(%r{^.*[/:]}, '').sub(%r{\.git$}, '')
       end
       
       def load_main_data

data/spec/tasks/deploy_spec.rb

@@ -23,6 +23,8 @@ describe 'rake tasks' do
           :checkout_main_repository,
           :install_hooks,
           :checkout_configuration_repository,
+          :update_main_repository_checkout,
+          :update_configuration_repository_checkout,
           :refresh_configuration,
           :run_post_setup_hooks, 
           :flush
@@ -61,6 +63,16 @@ describe 'rake tasks' do
         @rake["deploy:setup"].invoke
       end
       
+      it 'should update the main repository checkout' do
+        WhiskeyDisk.should.receive(:update_main_repository_checkout)
+        @rake["deploy:setup"].invoke
+      end
+      
+      it 'should update the configuration repository checkout' do
+        WhiskeyDisk.should.receive(:update_configuration_repository_checkout)
+        @rake["deploy:setup"].invoke
+      end
+      
       it 'should refresh the configuration' do
         WhiskeyDisk.should.receive(:refresh_configuration)
         @rake["deploy:setup"].invoke
@@ -85,6 +97,7 @@ describe 'rake tasks' do
         [ 
           :ensure_config_parent_path_is_present,
           :checkout_configuration_repository,
+          :update_configuration_repository_checkout,
           :refresh_configuration,
           :run_post_setup_hooks,
           :flush
@@ -122,6 +135,11 @@ describe 'rake tasks' do
         @rake["deploy:setup"].invoke
       end
       
+      it 'should update the configuration repository checkout' do
+        WhiskeyDisk.should.receive(:update_configuration_repository_checkout)
+        @rake["deploy:setup"].invoke
+      end
+      
       it 'should refresh the configuration' do
         WhiskeyDisk.should.receive(:refresh_configuration)
         @rake["deploy:setup"].invoke

data/spec/whiskey_disk/config_spec.rb

@@ -234,9 +234,17 @@ describe WhiskeyDisk::Config do
       WhiskeyDisk::Config.project_name({ 'repository' => 'git@foo/bar/baz'}).should == 'baz'
     end
     
-    it 'should return the last pasth segment, stripping .git, if the repository ends in .git' do
+    it 'should return the last path segment, stripping .git, if the repository ends in .git' do
       WhiskeyDisk::Config.project_name({ 'repository' => 'git@foo/bar/baz.git'}).should == 'baz'
     end
+
+    it 'should return the last :-delimited segment if the repository does not end in .git' do
+      WhiskeyDisk::Config.project_name({ 'repository' => 'git@foo/bar:baz'}).should == 'baz'
+    end
+    
+    it 'should return the last :-delimited segment, stripping .git, if the repository ends in .git' do
+      WhiskeyDisk::Config.project_name({ 'repository' => 'git@foo/bar:baz.git'}).should == 'baz'
+    end
   end
 
   describe 'finding the main configuration file' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: whiskey_disk
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors: 
 - Rick Bradley