whiskey_disk 0.0.0 → 0.0.1

data/Rakefile

@@ -20,7 +20,7 @@ begin
     gemspec.email = "rick@rickbradley.com"
     gemspec.homepage = "http://github.com/flogic/whiskey_disk"
     gemspec.authors = ["Rick Bradley"]
-    gemspec.add_dependency('vlad', '>= 1.3.2')
+    gemspec.add_dependency('rake')
   end
   Jeweler::GemcutterTasks.new  
 rescue LoadError

data/TODO.txt

@@ -1,3 +1,2 @@
  - update the README
- - push gem to gemcutter
  - install hooks (look at maybe git-deploy for good examples)

data/VERSION

@@ -1 +1 @@
-0.0.0
+0.0.1

data/lib/tasks/deploy.rb

@@ -1,6 +1,5 @@
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'whiskey_disk'))
 require 'rake'
-require 'vlad'
 
 namespace :deploy do
   desc "Perform initial setup for deployment"

data/lib/whiskey_disk.rb

@@ -36,10 +36,6 @@ class WhiskeyDisk
       File.split(path).last
     end
     
-    def register_configuration
-      configuration.each_pair {|k,v| set k, v }
-    end
-    
     def needs(*keys)
       keys.each do |key|
         raise "No value for '#{key}' declared in configuration files [#{WhiskeyDisk::Config.filenames.join(", ")}]" unless self[key]
@@ -48,16 +44,16 @@ class WhiskeyDisk
     
     def bundle
       return '' if buffer.empty?
-      buffer.collect {|c| "(#{c})" }.join(' && ')
+      buffer.collect {|c| "{ #{c} ; }"}.join(' && ')
+    end
+    
+    def run(cmd)
+      needs(:domain)
+      system('ssh', '-v', self[:domain], "set -x; " + cmd)
     end
     
     def flush
-      if remote?
-        register_configuration
-        run(bundle)
-      else
-        system(bundle)
-      end
+      remote? ? run(bundle) : system(bundle)
     end
     
     def ensure_main_parent_path_is_present
@@ -73,7 +69,7 @@ class WhiskeyDisk
     def checkout_main_repository
       needs(:deploy_to, :repository)
       enqueue "cd #{parent_path(self[:deploy_to])}"
-      enqueue "git clone #{self[:repository]} #{tail_path(self[:deploy_to])} || true"
+      enqueue "git clone #{self[:repository]} #{tail_path(self[:deploy_to])} ; true"
     end
     
     def install_hooks
@@ -84,7 +80,7 @@ class WhiskeyDisk
     def checkout_configuration_repository
       needs(:deploy_config_to, :config_repository)
       enqueue "cd #{parent_path(self[:deploy_config_to])}"
-      enqueue "git clone #{self[:config_repository]} #{tail_path(self[:deploy_config_to])} || true"
+      enqueue "git clone #{self[:config_repository]} #{tail_path(self[:deploy_config_to])} ; true"
     end
     
     def update_main_repository_checkout
@@ -110,13 +106,13 @@ class WhiskeyDisk
     def run_post_setup_hooks
       needs(:deploy_to)
       enqueue "cd #{self[:deploy_to]}"
-      enqueue "rake deploy:post_setup"
+      enqueue "rake --trace deploy:post_setup"
     end
 
     def run_post_deploy_hooks
       needs(:deploy_to)
       enqueue "cd #{self[:deploy_to]}"
-      enqueue "rake deploy:post_deploy"
+      enqueue "rake --trace deploy:post_deploy"
     end
   end
 end

data/spec/whiskey_disk_spec.rb

@@ -94,7 +94,7 @@ describe 'WhiskeyDisk' do
     
     it 'should ignore errors from failing to clone an existing repository' do
       WhiskeyDisk.checkout_main_repository
-      WhiskeyDisk.buffer.join(' ').should.match(%r{\|\| true})
+      WhiskeyDisk.buffer.join(' ').should.match(%r{; true})
     end
   end
   
@@ -146,7 +146,7 @@ describe 'WhiskeyDisk' do
 
     it 'should ignore errors from failing to clone an existing repository' do
       WhiskeyDisk.checkout_configuration_repository
-      WhiskeyDisk.buffer.join(' ').should.match(%r{\|\| true})
+      WhiskeyDisk.buffer.join(' ').should.match(%r{; true})
     end    
   end
   
@@ -309,11 +309,6 @@ describe 'WhiskeyDisk' do
         WhiskeyDisk.stub!(:run)
       end
       
-      it 'should register our configuration with vlad' do
-        WhiskeyDisk.should.receive(:register_configuration)
-        WhiskeyDisk.flush
-      end
-      
       it 'should bundle the buffer of commands' do
         WhiskeyDisk.enqueue('x')
         WhiskeyDisk.enqueue('y')
@@ -336,11 +331,6 @@ describe 'WhiskeyDisk' do
         WhiskeyDisk.stub!(:system)
       end
       
-      it 'should NOT register our configuration with vlad' do
-        WhiskeyDisk.should.not.receive(:register_configuration)
-        WhiskeyDisk.flush
-      end
-      
       it 'should bundle the buffer of commands' do
         WhiskeyDisk.enqueue('x')
         WhiskeyDisk.enqueue('y')
@@ -364,23 +354,38 @@ describe 'WhiskeyDisk' do
       WhiskeyDisk.bundle.should == ''
     end
     
-    it 'should wrap each command as a subshell () and join with &&s' do
+    it 'should wrap each command with {} and join with &&s' do
       WhiskeyDisk.enqueue("cd foo/bar/baz || true")
       WhiskeyDisk.enqueue("rsync -avz --progress /yer/mom /yo/")
-      WhiskeyDisk.bundle.should == "(cd foo/bar/baz || true) && (rsync -avz --progress /yer/mom /yo/)"
+      WhiskeyDisk.bundle.should == "{ cd foo/bar/baz || true ; } && { rsync -avz --progress /yer/mom /yo/ ; }"
     end
   end
   
-  describe 'registering the configuration with vlad' do
+  describe 'when running a command string remotely' do
     before do
-      @parameters = { 'deploy_to' => '/path/to/main/repo', 'foo' => 'bar', 'domain' => 'name' }
-      WhiskeyDisk::Config.stub!(:fetch).and_return(@parameters)
+      @domain = 'ogc@ogtastic.com'
+      WhiskeyDisk::Config.stub!(:fetch).and_return({ 'domain' => @domain })
+      WhiskeyDisk.reset
+      WhiskeyDisk.stub!(:system)      
+    end
+    
+    it 'should accept a command string' do
+      lambda { WhiskeyDisk.run('ls') }.should.not.raise(ArgumentError)
+    end
+    
+    it 'should require a command string' do
+      lambda { WhiskeyDisk.run }.should.raise(ArgumentError)
+    end
+    
+    it 'should fail if the domain path is not specified' do
+      WhiskeyDisk::Config.stub!(:fetch).and_return({})
       WhiskeyDisk.reset
+      lambda { WhiskeyDisk.run('ls') }.should.raise
     end
     
-    it "should call vlad's 'set' for each configuration parameters" do
-      @parameters.each_pair {|k,v| WhiskeyDisk.should.receive(:set).with(k, v) }
-      WhiskeyDisk.register_configuration
+    it 'should pass the string to ssh with verbosity enabled' do
+      WhiskeyDisk.should.receive(:system).with('ssh', '-v', @domain, "set -x; ls")
+      WhiskeyDisk.run('ls')
     end
   end
 end

data/tasks/deploy.rake

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: whiskey_disk
 version: !ruby/object:Gem::Version 
-  version: 0.0.0
+  version: 0.0.1
 platform: ruby
 authors: 
 - Rick Bradley
@@ -13,14 +13,14 @@ date: 2009-12-30 00:00:00 +05:30
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: vlad
+  name: rake
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.3.2
+        version: "0"
     version: 
 description: Opinionated gem for doing fast git-based server deployments.
 email: rick@rickbradley.com
@@ -51,6 +51,7 @@ files:
 - spec/tasks/deploy_spec.rb
 - spec/whiskey_disk/config_spec.rb
 - spec/whiskey_disk_spec.rb
+- tasks/deploy.rake
 has_rdoc: true
 homepage: http://github.com/flogic/whiskey_disk
 licenses: []