releasy 0.2.0 → 0.2.2

data/lib/releasy/version.rb

@@ -1,3 +1,3 @@
 module Releasy
-  VERSION = "0.2.0"
+  VERSION = "0.2.2"
 end

data/releasy.gemspec

@@ -29,7 +29,7 @@ END
   s.add_runtime_dependency('rake', '~> 0.9.2.2')
   s.add_runtime_dependency('cri', '~> 2.1.0')
   s.add_runtime_dependency('thor', '~> 0.14.6') # Only needed in Ruby 1.8, since it provides HashWithIndifferentAccess.
-  s.add_runtime_dependency('net-github-upload', '~> 0.0.7')
+  s.add_runtime_dependency('net-github-upload', '~> 0.0.8')
 
   s.add_development_dependency('riot', '~> 0.12.5')
   s.add_development_dependency('rr', '~> 1.0.4')

data/test/releasy/builders/data/Main.rb

@@ -6,7 +6,8 @@ OSX_EXECUTABLE_FOLDER = File.expand_path("../../..", __FILE__)
 
 # Really hacky fudge-fix for something oddly missing in the .app.
 class Encoding
-  UTF_7 = UTF_16BE = UTF_16LE = UTF_32BE = UTF_32LE = Encoding.list.first
+  BINARY = UTF_7 = UTF_16BE = UTF_16LE = UTF_32BE = UTF_32LE = Encoding.list.first
 end
 
-load 'application/bin/test_app'
+Dir.chdir 'application'
+load 'bin/test_app'

data/test/releasy/builders/helpers/builder_helper.rb

@@ -0,0 +1,35 @@
+require File.expand_path("helper", File.dirname(__FILE__))
+
+def acts_like_a_builder
+  context Releasy::Builders::Builder do
+    asserts_topic.kind_of Releasy::Builders::Builder
+
+    asserts_topic.respond_to :setup
+    asserts_topic.respond_to :task_group
+    asserts_topic.respond_to :folder
+
+    asserts(:type).equals { topic.class::TYPE }
+    asserts(:suffix).equals { topic.class::DEFAULT_FOLDER_SUFFIX }
+    asserts("valid_for_platform? returns a Boolean") { [true, false].include? topic.valid_for_platform? }
+
+    asserts(:project).is_a? Releasy::Project
+    asserts(:suffix).is_a? String
+
+    asserts(:suffix=, 5).raises TypeError
+
+    context "#suffix=" do
+      hookup { topic.suffix = "hello" }
+      asserts(:suffix).equals "hello"
+    end
+
+    context "#copy_files_relative" do
+      should "copy files to their relative directories" do
+        mock(topic).mkdir_p "d/.", :verbose => false
+        mock(topic).cp "a", "d/.", :verbose => false
+        mock(topic).mkdir_p "d/b", :verbose => false
+        mock(topic).cp "b/c", "d/b", :verbose => false
+        topic.send :copy_files_relative, %w[a b/c], 'd'
+      end
+    end
+  end
+end

data/test/releasy/builders/helpers/ocra_builder_helper.rb

@@ -0,0 +1,31 @@
+require File.expand_path("windows_builder_helper", File.dirname(__FILE__))
+
+def acts_like_an_ocra_builder
+  acts_like_a_windows_builder
+
+  context Releasy::Builders::OcraBuilder do
+    asserts_topic.kind_of Releasy::Builders::OcraBuilder
+    asserts(:ocra_parameters).equals ""
+    asserts(:icon).nil
+    asserts("setting incorrect icon") { topic.icon = "frog.png" }.raises ArgumentError, /icon must be a .ico file/
+    asserts(:ocra_command).raises Releasy::ConfigError, /Unless the executable file extension is .rbw or .rb, then #executable_type must be explicitly :windows or :console/
+
+    context "#icon=" do
+      hookup { topic.icon = "icon.ico" }
+      asserts(:icon).equals "icon.ico"
+    end
+
+    context "#ocra_command" do
+      hookup do
+        topic.exclude_encoding
+        topic.ocra_parameters = "--wobble"
+        topic.project.executable = source_files.first
+        topic.executable_type = :console
+        topic.icon = "icon.ico"
+      end
+
+      helper(:command) { %[ocra "bin/test_app" --console --no-enc --wobble --icon "icon.ico" "lib/test_app.rb" "lib/test_app/stuff.rb" "README.txt" "LICENSE.txt" "Gemfile.lock" "Gemfile"] }
+      asserts(:ocra_command).equals { %[bundle exec #{command}] }
+    end
+  end
+end

data/test/releasy/builders/helpers/windows_builder_helper.rb

@@ -0,0 +1,25 @@
+require File.expand_path("builder_helper", File.dirname(__FILE__))
+
+def acts_like_a_windows_builder
+  acts_like_a_builder
+
+  context Releasy::Builders::WindowsBuilder do
+    asserts_topic.kind_of Releasy::Builders::WindowsBuilder
+    context "#executable_type undefined and Project#executable doesn't have meaningful extension" do
+      hookup { topic.project.executable = "fred" }
+      asserts(:effective_executable_type).raises Releasy::ConfigError, /Unless the executable file extension is .rbw or .rb, then #executable_type must be explicitly :windows or :console/
+    end
+
+    context "valid" do
+      hookup { topic.executable_type = :console }
+
+      asserts(:effective_executable_type).equals :console
+      asserts(:encoding_excluded?).equals false
+
+      context "exclude_encoding" do
+        hookup { topic.exclude_encoding }
+        asserts(:encoding_excluded?).equals true
+      end
+    end
+  end
+end

data/test/releasy/builders/osx_app_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path("helpers/helper", File.dirname(__FILE__))
+require File.expand_path("helpers/builder_helper", File.dirname(__FILE__))
 
 folder = File.join(output_path, "test_app_0_1_OSX")
 app_folder = File.join(folder, "Test App.app")
@@ -17,6 +17,8 @@ if osx_app_wrapper
       Dir.chdir project_path
     end
 
+    acts_like_a_builder
+
     asserts(:folder_suffix).equals "OSX"
     asserts(:encoding_excluded?).equals false
     asserts(:icon=, "test_app.ico").raises ArgumentError, /icon must be a .icns file/
@@ -69,9 +71,9 @@ if osx_app_wrapper
       context "tasks" do
         tasks = [
             [ :Task, "build:osx:app", [folder] ],
-            [ :FileCreationTask, '..', [] ], # byproduct of using #directory
-            [ :FileCreationTask, output_path, [] ], # byproduct of using #directory
-            [ :FileCreationTask, folder, source_files + [osx_app_wrapper]],
+            [ :FileTask, '..', [] ], # byproduct of using #directory
+            [ :FileTask, output_path, [] ], # byproduct of using #directory
+            [ :FileTask, folder, source_files + [osx_app_wrapper]],
         ]
 
         test_tasks tasks

data/test/releasy/builders/source_test.rb

@@ -1,4 +1,5 @@
-require File.expand_path("helpers/helper", File.dirname(__FILE__))
+require File.expand_path("helpers/builder_helper", File.dirname(__FILE__))
+
 
 folder = File.join(output_path, "test_app_0_1_SOURCE")
 context Releasy::Builders::Source do
@@ -13,6 +14,8 @@ context Releasy::Builders::Source do
     Dir.chdir project_path
   end
 
+  acts_like_a_builder
+
   context "valid" do
     hookup do
 
@@ -25,9 +28,9 @@ context Releasy::Builders::Source do
     context "tasks" do
       tasks = [
           [ :Task, "build:source", [folder] ],
-          [ :FileCreationTask, '..', [] ], # byproduct of using #directory
-          [ :FileCreationTask, output_path, [] ], # byproduct of using #directory
-          [ :FileCreationTask, folder, source_files ],
+          [ :FileTask, '..', [] ], # byproduct of using #directory
+          [ :FileTask, output_path, [] ], # byproduct of using #directory
+          [ :FileTask, folder, source_files ],
       ]
 
       test_tasks tasks

data/test/releasy/builders/windows_folder_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path("helpers/helper", File.dirname(__FILE__))
+require File.expand_path("helpers/ocra_builder_helper", File.dirname(__FILE__))
 
 folder = File.join(output_path, "test_app_0_1_WIN32")
 
@@ -12,6 +12,8 @@ context Releasy::Builders::WindowsFolder do
 
   hookup { Dir.chdir project_path }
 
+  acts_like_an_ocra_builder
+
   context "valid" do
     if Gem.win_platform?
       context "on Windows" do

data/test/releasy/builders/windows_installer_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path("helpers/helper", File.dirname(__FILE__))
+require File.expand_path("helpers/ocra_builder_helper", File.dirname(__FILE__))
 
 folder = File.join(output_path, "test_app_0_1_WIN32_INSTALLER")
 
@@ -12,6 +12,8 @@ context Releasy::Builders::WindowsInstaller do
 
   hookup { Dir.chdir project_path }
 
+  acts_like_an_ocra_builder
+
   context "valid" do
     if Gem.win_platform?
       context "on Windows" do
@@ -36,9 +38,9 @@ context Releasy::Builders::WindowsInstaller do
         context "tasks" do
           tasks = [
               [ :Task, "build:windows:installer", [folder] ],
-              [ :FileCreationTask, '..', [] ], # byproduct of using #directory
-              [ :FileCreationTask, output_path, [] ], # byproduct of using #directory
-              [ :FileCreationTask, folder, source_files ],
+              [ :FileTask, '..', [] ], # byproduct of using #directory
+              [ :FileTask, output_path, [] ], # byproduct of using #directory
+              [ :FileTask, folder, source_files ],
           ]
 
           test_tasks tasks

data/test/releasy/builders/windows_standalone_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path("helpers/helper", File.dirname(__FILE__))
+require File.expand_path("helpers/ocra_builder_helper", File.dirname(__FILE__))
 
 folder = File.join(output_path, "test_app_0_1_WIN32_EXE")
 
@@ -12,6 +12,8 @@ context Releasy::Builders::WindowsStandalone do
 
   hookup { Dir.chdir project_path }
 
+  acts_like_an_ocra_builder
+
   context "valid" do
     if Gem.win_platform?
       context "on Windows" do
@@ -31,9 +33,9 @@ context Releasy::Builders::WindowsStandalone do
         context "tasks" do
           tasks = [
               [ :Task, "build:windows:standalone", [folder] ],
-              [ :FileCreationTask, '..', [] ], # byproduct of using #directory
-              [ :FileCreationTask, output_path, [] ], # byproduct of using #directory
-              [ :FileCreationTask, folder, source_files ],
+              [ :FileTask, '..', [] ], # byproduct of using #directory
+              [ :FileTask, output_path, [] ], # byproduct of using #directory
+              [ :FileTask, folder, source_files ],
           ]
 
           test_tasks tasks

data/test/releasy/builders/windows_wrapped_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path("helpers/helper", File.dirname(__FILE__))
+require File.expand_path("helpers/windows_builder_helper", File.dirname(__FILE__))
 
 Dir[File.expand_path("wrappers/ruby-*.7z", $original_path)].each do |path_to_ruby_dist|
   ruby_version = path_to_ruby_dist[/\d\.\d\.\d-p\d+/]
@@ -17,6 +17,8 @@ Dir[File.expand_path("wrappers/ruby-*.7z", $original_path)].each do |path_to_rub
       Dir.chdir project_path
     end
 
+    acts_like_a_windows_builder
+
     asserts(:wrapper).nil
     asserts(:folder_suffix).equals "WIN32"
     asserts(:generate_tasks).raises Releasy::ConfigError, /wrapper not set/

data/test/releasy/cli/install_sfx_test.rb

@@ -79,7 +79,7 @@ context "releasy install-sfx" do
       stub(File).exists?("/usr/lib/p7zip/7z.sfx").returns false
       stub(FileUtils).cp(File.expand_path("bin/7z.sfx"), "/usr/lib/p7zip", :verbose => true) { raise Errno::ENOENT }
       any_instance_of(Cri::CommandDSL) do |o|
-        mock(o).exec(%[sudo cp "#{File.expand_path('bin/7z.sfx')}" "/usr/lib/p7zip"]) do
+        mock(o).system(%[sudo cp "#{File.expand_path('bin/7z.sfx')}" "/usr/lib/p7zip"]) do
           stub(File).exists?("/usr/lib/p7zip/7z.sfx").returns true
         end
       end

data/test/releasy/deployers/github_test.rb

@@ -3,10 +3,8 @@ require 'net/github-upload' # Because this isn't otherwise loaded until it is ne
 
 context Releasy::Deployers::Github do
   setup do
-    any_instance_of Releasy::Deployers::Github do |github|
-      stub(github, :`).with("git config github.user").returns "test_user"
-      stub(github, :`).with("git config github.token").returns "0" * 32
-    end
+    stub(Kernel, :`).with("git config github.user").returns "test_user"
+    stub(Kernel, :`).with("git config github.token").returns "0" * 32
 
     Releasy::Deployers::Github.new new_project
   end
@@ -20,15 +18,14 @@ context Releasy::Deployers::Github do
     Dir.chdir project_path
   end
 
+  asserts(:type).equals :github
   asserts(:user).equals "test_user"
   asserts(:token).equals "0" * 32
   asserts(:description).equals "Test App 0.1"
 
   context "repository not configured" do
     setup do
-      any_instance_of Releasy::Deployers::Github do |github|
-        mock(github, :`).with("git config remote.origin.url").returns { raise Errno::ENOENT }
-      end
+      mock(Kernel, :`).with("git config remote.origin.url").returns { raise Errno::ENOENT }
 
       Releasy::Deployers::Github.new new_project
     end
@@ -38,9 +35,7 @@ context Releasy::Deployers::Github do
 
   context "repository configured" do
     setup do
-      any_instance_of Releasy::Deployers::Github do |github|
-        mock(github, :`).with("git config remote.origin.url").returns "git@github.com:test_user/test-app.git"
-      end
+      mock(Kernel, :`).with("git config remote.origin.url").returns "git@github.com:test_user/test-app.git"
 
       Releasy::Deployers::Github.new new_project
     end
@@ -50,10 +45,8 @@ context Releasy::Deployers::Github do
 
   context "user not configured" do
     setup do
-      any_instance_of Releasy::Deployers::Github do |github|
-        mock(github, :`).with("git config github.user").returns { raise Errno::ENOENT }
-        mock(github, :`).with("git config github.token").returns "0" * 32
-      end
+      mock(Kernel, :`).with("git config github.user").returns { raise Errno::ENOENT }
+      mock(Kernel, :`).with("git config github.token").returns "0" * 32
 
       Releasy::Deployers::Github.new new_project
     end
@@ -65,10 +58,9 @@ context Releasy::Deployers::Github do
 
   context "token not configured" do
     setup do
-      any_instance_of Releasy::Deployers::Github do |github|
-        mock(github, :`).with("git config github.user").returns "test_user"
-        mock(github, :`).with("git config github.token").returns { raise Errno::ENOENT }
-      end
+      mock(Kernel, :`).with("git config github.user").returns "test_user"
+      mock(Kernel, :`).with("git config github.token").returns { raise Errno::ENOENT }
+
       Releasy::Deployers::Github.new new_project
     end
 
@@ -89,12 +81,9 @@ context Releasy::Deployers::Github do
     end
 
     context "#deploy" do
-      helper(:stub_file_size) { stub(File).size("file.zip").returns 1000 }
-
-      should "expect an Net::GitHub::Upload to be created and used to upload" do
-        stub_file_size
+      should "upload the file if it doesn't exist on the server" do
         mock(Net::GitHub::Upload).new :login => "test_user", :token => "0" * 32 do
-          mock!.upload_async :repos => "test_app", :file => "file.zip", :description => "Test App 0.1", :replace => false, :upload_timeout => 3600
+          mock!.upload :repos => "test_app", :file => "file.zip", :description => "Test App 0.1", :replace => false, :upload_timeout => 3600
         end
 
         topic.send :deploy, "file.zip"
@@ -102,25 +91,34 @@ context Releasy::Deployers::Github do
         true
       end
 
-      should "expect an Net::GitHub::Upload to be created and exit (not forcing replacement and file already exists)" do
-        stub_file_size
+      should "give a warning if the file already exists and not in replacement mode" do
         mock(Net::GitHub::Upload).new :login => "test_user", :token => "0" * 32 do
-          mock!.upload_async :repos => "test_app", :file => "file.zip", :description => "Test App 0.1", :replace => false, :upload_timeout => 3600 do
-            raise "file already exists"
+          mock!.upload :repos => "test_app", :file => "file.zip", :description => "Test App 0.1", :replace => false, :upload_timeout => 3600 do
+            raise "file 'file.zip' is already uploaded. please try different name"
           end
         end
-
-        mock(topic).exit(1)
+        mock(topic).warn "Skipping 'file.zip' as it is already uploaded. Use #replace! to force uploading"
 
         topic.send :deploy, "file.zip"
 
         true
       end
 
-      should "expect an Net::GitHub::Upload to be created and used to upload (forcing replacement)" do
-        stub_file_size
+      asserts "errors other than file already exists" do
+        mock(Net::GitHub::Upload).new :login => "test_user", :token => "0" * 32 do
+          mock!.upload :repos => "test_app", :file => "file.zip", :description => "Test App 0.1", :replace => false, :upload_timeout => 3600 do
+            raise "something else happened"
+          end
+        end
+
+        dont_allow(topic).warn anything
+
+        topic.send :deploy, "file.zip"
+      end.raises RuntimeError, "something else happened"
+
+      should "upload the file if it exists on the server and in replacement mode" do
         mock(Net::GitHub::Upload).new :login => "test_user", :token => "0" * 32 do
-          mock!.upload_async :repos => "test_app", :file => "file.zip", :description => "Test App 0.1", :replace => true, :upload_timeout => 3600
+          mock!.upload :repos => "test_app", :file => "file.zip", :description => "Test App 0.1", :replace => true, :upload_timeout => 3600
         end
 
         topic.replace!

data/test/releasy/deployers/local_test.rb

@@ -0,0 +1,93 @@
+require File.expand_path("helpers/helper", File.dirname(__FILE__))
+
+context Releasy::Deployers::Local do
+  setup do
+    Releasy::Deployers::Local.new new_project
+  end
+
+  teardown do
+    Dir.chdir $original_path
+    Rake::Task.clear
+  end
+
+  hookup do
+    Dir.chdir project_path
+  end
+
+  asserts(:type).equals :local
+  asserts(:path).nil
+  asserts(:path=, 5).raises TypeError, /path must be a String/
+
+  context "#path=" do
+    hookup { topic.path = "fish" }
+    asserts(:path).equals "fish"
+  end
+
+  context "valid" do
+    context "#generate_tasks" do
+      hookup { topic.send :generate_tasks, "source:7z", "SOURCE.7z", ".7z" }
+      tasks = [
+          [ :Task, "deploy:source:7z:local", %w[package:source:7z] ],
+      ]
+
+      test_tasks tasks
+    end
+
+    context "#deploy" do
+      context "without #path" do
+        asserts(:deploy, "file.zip").raises Releasy::ConfigError, /#path must be set/
+      end
+
+      context "valid" do
+        hookup { topic.path = "fish" }
+
+        should "create directory and copy file if directory doesn't exist" do
+          stub(File).exists?("fish").returns false
+          stub(File).exists?("fish/file.zip").returns false
+
+          mock(topic).mkdir_p("fish", :verbose => false)
+          mock(topic).cp("file.zip", "fish", :verbose => false, :force => false)
+          topic.send :deploy, "file.zip"
+
+          true
+        end
+
+        should "copy file to directory if directory exists" do
+          stub(File).exists?("fish").returns true
+          stub(File).exists?("fish/file.zip").returns false
+
+          mock(topic).cp("file.zip", "fish", :verbose => false, :force => false)
+          topic.send :deploy, "file.zip"
+
+          true
+        end
+
+        should "copy file forcefully if destination file is older" do
+          stub(File).exists?("fish").returns true
+          stub(File).exists?("fish/file.zip").returns true
+          stub(File).ctime("fish/file.zip").returns 0
+          stub(File).ctime("file.zip").returns 1
+
+          mock(topic).cp("file.zip", "fish", :verbose => false, :force => true)
+          topic.send :deploy, "file.zip"
+
+          true
+        end
+
+        should "not copy file if destination file is not older" do
+          stub(File).exists?("fish").returns true
+          stub(File).exists?("fish/file.zip").returns true
+          stub(File).ctime("fish/file.zip").returns 1
+          stub(File).ctime("file.zip").returns 1
+
+          dont_allow(topic).cp
+          mock(topic).warn "Skipping 'file.zip' because it already exists in 'fish'"
+          topic.send :deploy, "file.zip"
+
+          true
+        end
+      end
+    end
+
+  end
+end