box-release 0.0.2 → 0.0.3

data/box-release.gemspec

@@ -21,6 +21,6 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency("activesupport")
 
-  # s.add_development_dependency('rspec')
-  # s.add_development_dependency('rcov')
+  s.add_development_dependency('rspec')
+  s.add_development_dependency('rcov')
 end

data/lib/box/release.rb

@@ -24,6 +24,9 @@ module Box
     @@install_command = nil
     mattr_accessor :install_command
 
+    @@download_directory = "/tmp"
+    mattr_accessor :download_directory
+
     class ExecutionError < StandardError; end
 
     def self.execute!(command)

data/lib/box/release/base.rb

@@ -62,7 +62,7 @@ module Box
       # end
 
       def file
-        "/tmp/release.tar"
+        "#{download_directory}/release.tar"
       end
 
       def newer?(other)

data/lib/box/release/cli.rb

@@ -4,7 +4,7 @@ module Box
   module Release
     class CLI
 
-      attr_accessor :url, :current_definition, :install_command, :before_download_command
+      attr_accessor :url, :current_definition, :install_command, :before_download_command, :after_download_command, :download_directory
 
       def initialize(arguments = [])
         @install_command = "/usr/local/sbin/box-upgrade"
@@ -32,6 +32,10 @@ module Box
                      "The install command used to install the release") { |arg| self.install_command = arg }
           options.on("-b", "--before-download=command", String, 
                      "The command executed before download starts") { |arg| self.before_download_command = arg }
+          options.on("-a", "--after-download=command", String, 
+                     "The command executed after download ends (or fails)") { |arg| self.after_download_command = arg }
+          options.on("-d", "--download-dir=directory", String, 
+                     "The direcotry where the release file will be temporary stored") { |arg| self.download_directory = arg }
         end
       end
 
@@ -70,11 +74,22 @@ module Box
         Box::Release.execute! before_download_command if before_download_command
       end
 
+      def after_download
+        Box::Release.execute! after_download_command if after_download_command
+      end
+
       def upgrade
         if latest and latest.newer?(current)
           Box::Release.logger.info "New release : #{latest}"
+          Box::Release.download_directory = download_directory
           before_download
-          latest.download
+
+          begin
+            latest.download
+          ensure
+            after_download
+          end
+
           Box::Release.logger.info "Replace #{current} with #{latest}"
           latest.install :install_command => install_command
           Box::Release.logger.info "Successfully installed #{latest}"

data/lib/box/release/memory.rb

@@ -26,6 +26,10 @@ module Box
       def install_command
         Box::Release.install_command
       end
+
+      def download_directory
+        Box::Release.download_directory
+      end
     end
   end
 end

data/lib/box/release/version.rb

@@ -1,5 +1,5 @@
 module Box
   module Release
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/spec/box/release/base_spec.rb

@@ -8,9 +8,20 @@ describe Box::Release::Base do
 
   subject { Box::Release::Memory.new }
 
-  its(:file) { should == "/tmp/release.tar" }
+  describe "#file" do
+
+    context "by default" do
+      its(:file) { should == "/tmp/release.tar" }
+    end
+
+    it "should use Box::Release.download_directory when defined" do
+      subject.stub :download_directory => "/dummy"
+      subject.file.should == "/dummy/release.tar"
+    end
+
+  end
   
-  describe "download" do
+  describe "#download" do
 
     before(:each) do
       FileUtils.rm_f(subject.file)

data/spec/box/release/cli_spec.rb

@@ -30,6 +30,19 @@ describe Box::Release::CLI do
 
   end
 
+  describe "#download_directory" do
+    
+    it "should be nil by default" do
+      subject.download_directory.should be_nil
+    end
+
+    it "should use the value specified with --download-dir" do
+      subject.parse_options %w{--download-dir /dummy}
+      subject.download_directory.should == "/dummy"
+    end
+
+  end
+
   describe "#url" do
     
     it "should be nil by default" do
@@ -195,12 +208,30 @@ describe Box::Release::CLI do
 
       let(:latest) { mock :name => "latest", :newer? => true, :download => true, :install => true }
 
+      it "should use download_directory as Box::Release.download_directory" do
+        subject.download_directory = "/dummy"
+        subject.upgrade
+        Box::Release.download_directory.should == "/dummy"
+      end
+
       it "should invoke before_download ... before downloading latest release" do
         subject.should_receive(:before_download).ordered
         subject.latest.should_receive(:download).ordered
         subject.upgrade
       end
 
+      it "should invoke after_download ... after downloading latest release" do
+        subject.latest.should_receive(:download).ordered
+        subject.should_receive(:after_download).ordered
+        subject.upgrade
+      end
+
+      it "should invoke after_download even if download fails" do
+        subject.latest.should_receive(:download).and_raise("fail")
+        subject.should_receive(:after_download)
+        lambda { subject.upgrade }.should raise_error
+      end
+
       it "should download the latest release" do
         subject.latest.should_receive(:download)
         subject.upgrade

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: box-release
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Alban Peignier
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-11 00:00:00 Z
+date: 2011-05-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -32,6 +32,34 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rcov
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
 description: ""
 email: 
 - alban@tryphon.eu