releasy 0.2.0 → 0.2.2

data/test/releasy/deployers/rsync_test.rb

@@ -0,0 +1,55 @@
+require File.expand_path("helpers/helper", File.dirname(__FILE__))
+
+context Releasy::Deployers::Rsync do
+  setup do
+    Releasy::Deployers::Rsync.new new_project
+  end
+
+  teardown do
+    Dir.chdir $original_path
+    Rake::Task.clear
+  end
+
+  hookup do
+    Dir.chdir project_path
+  end
+
+  asserts(:type).equals :rsync
+  asserts(:destination).nil
+  asserts(:destination=, 5).raises TypeError, /destination must be a String/
+  asserts(:options).equals '-glpPrtvz'
+  asserts(:options=, 5).raises TypeError, /options must be a String/
+  asserts(:deploy, "file.zip").raises Releasy::ConfigError, /#destination must be set/
+
+  context "#destination=" do
+    hookup { topic.destination = "fish:www/frog" }
+    asserts(:destination).equals "fish:www/frog"
+  end
+
+  context "#options=" do
+    hookup { topic.options = "-frog" }
+    asserts(:options).equals "-frog"
+  end
+
+  context "valid" do
+    context "#generate_tasks" do
+      hookup { topic.send :generate_tasks, "source:7z", "SOURCE.7z", ".7z" }
+      tasks = [
+          [ :Task, "deploy:source:7z:rsync", %w[package:source:7z] ],
+      ]
+
+      test_tasks tasks
+    end
+
+    should "call rsync correctly" do
+      mock(IO).popen(%[rsync -xyz "#{File.expand_path "pkg/x.zip"}" "fish:www/frog"]).yields StringIO.new("done")
+
+      topic.options = "-xyz"
+      topic.destination = "fish:www/frog"
+
+      topic.send :deploy, "pkg/x.zip"
+
+      true
+    end
+  end
+end

data/test/releasy/integration/source_test.rb

@@ -16,7 +16,6 @@ context "Source in all formats" do
       version "0.1"
       files source_files
       output_path _output_path
-      verbose
       create_md5s
 
       add_build :source do
@@ -43,6 +42,7 @@ context "Source in all formats" do
   end
 
   helper(:contents_description) { /#{source_files.size} files, 4 folders/m }
+  helper(:null_file) { Gem.win_platform? ? "NUL" : "/dev/null" }
 
   active_builders_valid
 
@@ -77,9 +77,9 @@ context "Source in all formats" do
         [ :Task, "build", %w[build:source] ],
         [ :Task, "build:source", [folder] ],
 
-        [ :FileCreationTask, '..', [] ],
-        [ :FileCreationTask, output_path, [] ], # byproduct of using #directory
-        [ :FileCreationTask, folder, source_files ],
+        [ :FileTask, '..', [] ],
+        [ :FileTask, output_path, [] ], # byproduct of using #directory
+        [ :FileTask, folder, source_files ],
         [ :FileTask, "#{folder}.dmg", [folder] ],
         [ :FileTask, "#{folder}.7z", [folder] ],
         [ :FileTask, "#{folder}.exe", [folder] ],
@@ -111,7 +111,7 @@ context "Source in all formats" do
     hookup { Rake::Task["package:source:tar_gz"].invoke }
 
     asserts("archive created") { File.size("#{folder}.tar.gz") > 0}
-    asserts("archive contains expected files") { `7z x -so -bd -tgzip #{folder}.tar.gz | 7z l -si -bd -ttar` =~ contents_description }
+    asserts("archive contains expected files") { `7z x -so -bd -tgzip #{folder}.tar.gz 2>#{null_file} | 7z l -si -bd -ttar` =~ contents_description }
     md5_created ".tar.gz"
   end
 
@@ -119,7 +119,7 @@ context "Source in all formats" do
     hookup { Rake::Task["package:source:tar_bz2"].invoke }
 
     asserts("archive created") { File.size("#{folder}.tar.bz2") > 0}
-    asserts("archive contains expected files") { `7z x -so -bd -tbzip2 #{folder}.tar.bz2 | 7z l -si -bd -ttar` =~ contents_description }
+    asserts("archive contains expected files") { `7z x -so -bd -tbzip2 #{folder}.tar.bz2 2>#{null_file} | 7z l -si -bd -ttar` =~ contents_description }
     md5_created ".tar.bz2"
   end
 

data/test/releasy/mixins/utilities_test.rb

@@ -0,0 +1,50 @@
+require File.expand_path("../../teststrap", File.dirname(__FILE__))
+
+context Releasy::Mixins::Utilities do
+  setup { Object.new.extend Releasy::Mixins::Utilities }
+
+  context "#execute_command" do
+    asserts("executing command that exists") do
+      mock(IO).popen("hello").yields StringIO.new("Hello!\nHello!\n")
+      mock(topic).info("hello")
+      mock(topic).info("Hello!").twice
+      topic.send :execute_command, "hello"
+    end.equals true
+
+    asserts("executing command that doesn't exist") do
+      mock(IO).popen("hello") { raise Errno::ENOENT }
+      mock(topic).info("hello")
+      topic.send :execute_command, "hello"
+    end.equals false
+  end
+
+  context "#command_available?" do
+    context "on Windows" do
+      should "return true if available" do
+        stub(Releasy).win_platform?.returns true
+        mock(Kernel, :`).with("where command").returns true
+        topic.send(:command_available?, "command")
+      end.equals true
+
+      should "return false if not available" do
+        stub(Releasy).win_platform?.returns true
+        mock(Kernel, :`).with("where command").returns nil
+        topic.send(:command_available?, "command")
+      end.equals false
+    end
+
+    context "not on Windows" do
+      should "return true if available" do
+        stub(Releasy).win_platform?.returns false
+        mock(Kernel, :`).with("which command").returns true
+        topic.send(:command_available?, "command")
+      end.equals true
+
+      should "return false if not available" do
+        stub(Releasy).win_platform?.returns false
+        mock(Kernel, :`).with("which command").returns nil
+        topic.send(:command_available?, "command")
+      end.equals false
+    end
+  end
+end

data/test/releasy/packagers/packager_test.rb

@@ -0,0 +1,79 @@
+require File.expand_path("../../teststrap", File.dirname(__FILE__))
+
+
+context Releasy::Packagers::Packager do
+  helper(:project) { @project ||= Object.new }
+
+  setup do
+    Class.new(Releasy::Packagers::Packager) do
+      const_set :TYPE, :test
+      const_set :DEFAULT_EXTENSION, '.bleh'
+    end.new project
+  end
+
+  asserts(:project).equals { project }
+  asserts(:type).equals :test
+  asserts(:extension).equals ".bleh"
+  asserts(:extension=, 12).raises TypeError, /extension must be a String/
+  asserts(:extension=, "frog").raises ArgumentError, /extension must be valid/
+  asserts(:package, "fish").equals "fish.bleh"
+
+  asserts_topic.respond_to :checksum
+  asserts_topic.respond_to :generate_tasks
+  asserts_topic.respond_to :archive
+
+  context "#seven_zip_command" do
+    helper(:setup) do |windows, za, z|
+      stub(Releasy).win_platform?.returns windows
+      find = windows ? "where" : "which"
+      mock(Kernel, :`).with("#{find} 7za").returns za
+      mock(Kernel, :`).with("#{find} 7z").returns z unless z.nil?
+    end
+
+    context "on Windows" do
+      context "7za command available" do
+        asserts :seven_zip_command do
+          setup true, true, nil
+          topic.send :seven_zip_command
+        end.equals "7za"
+      end
+
+      context "7za not available, but 7z is" do
+        asserts :seven_zip_command do
+          setup true, false, true
+          topic.send :seven_zip_command
+        end.equals "7z"
+      end
+
+      context "no 7z installation" do
+        asserts :seven_zip_command do
+          setup true, false, false
+          topic.send :seven_zip_command
+        end.equals %["#{File.expand_path "../../../../bin/7za.exe", __FILE__}"]
+      end
+    end
+
+    context "not on Windows" do
+      context "7za command available" do
+        asserts :seven_zip_command do
+          setup false, true, nil
+          topic.send :seven_zip_command
+        end.equals "7za"
+      end
+
+      context "7za not available, but 7z is" do
+        asserts :seven_zip_command do
+          setup false, false, true
+          topic.send :seven_zip_command
+        end.equals "7z"
+      end
+
+      context "no 7z installation" do
+        asserts :seven_zip_command do
+          setup false, false, false
+          topic.send :seven_zip_command
+        end.raises Releasy::CommandNotFoundError, /Failed to find 7-ZIP/
+      end
+    end
+  end
+end

data/test/releasy/packagers_test.rb

@@ -1,13 +1,14 @@
 require File.expand_path("../teststrap", File.dirname(__FILE__))
 
 # Test all packagers at once, since they are pretty much identical.
+null_file = Gem.win_platform? ? "NUL" : "/dev/null"
 [
     [:dmg,     Releasy::Packagers::Dmg,      %[GZIP=-9 hdiutil create -fs HFS+ -srcfolder "f" -volname "Test App 0.1" "f.dmg"]],
-    [:exe,     Releasy::Packagers::Exe,      %[7z a -mmt -bd -t7z -mx9 -sfx7z.sfx "f.exe" "f"]],
-    [:"7z",    Releasy::Packagers::SevenZip, %[7z a -mmt -bd -t7z -mx9 "f.7z" "f"]],
-    [:tar_bz2, Releasy::Packagers::TarBzip2, %[7z a -so -mmt -bd -ttar "f.tar" "f" | 7z a -si -bd -tbzip2 -mx9 "f.tar.bz2"]],
-    [:tar_gz,  Releasy::Packagers::TarGzip,  %[7z a -so -mmt -bd -ttar "f.tar" "f" | 7z a -si -bd -tgzip -mx9 "f.tar.gz"]],
-    [:zip,     Releasy::Packagers::Zip,      %[7z a -mmt -bd -tzip -mx9 "f.zip" "f"]],
+    [:exe,     Releasy::Packagers::Exe,      %[7za a -mmt -bd -t7z -mx9 -sfx7z.sfx "f.exe" "f"]],
+    [:"7z",    Releasy::Packagers::SevenZip, %[7za a -mmt -bd -t7z -mx9 "f.7z" "f"]],
+    [:tar_bz2, Releasy::Packagers::TarBzip2, %[7za a -so -mmt -bd -ttar "f.tar" "f" 2>#{null_file} | 7za a -si -bd -tbzip2 -mx9 "f.tar.bz2"]],
+    [:tar_gz,  Releasy::Packagers::TarGzip,  %[7za a -so -mmt -bd -ttar "f.tar" "f" 2>#{null_file} | 7za a -si -bd -tgzip -mx9 "f.tar.gz"]],
+    [:zip,     Releasy::Packagers::Zip,      %[7za a -mmt -bd -tzip -mx9 "f.zip" "f"]],
 ].each do |type, packager, command|
   extension = "." + type.to_s.tr("_", ".")
 
@@ -22,7 +23,12 @@ require File.expand_path("../teststrap", File.dirname(__FILE__))
 
     asserts(:type).equals type
     asserts(:extension).equals extension
-    asserts(:command, "f").equals command
+    context "" do
+      hookup do
+        mock(Kernel, :`).with("#{Gem.win_platform? ? "where" : "which"} 7za").returns(true) unless type == :dmg
+      end
+      asserts(:command, "f").equals command
+    end
     asserts(:package, "f").equals "f#{extension}"
 
     context "setting extension with a . changes package path" do

data/test/releasy/project_test.rb

@@ -257,17 +257,17 @@ context Releasy::Project do
             [ :Task, "build:windows", %w[build:windows:installer] ],
             [ :Task, "build:windows:installer", ["#{folder_base}_WIN32_INSTALLER"] ],
 
-            [ :FileCreationTask, 'pkg', [] ],
+            [ :FileTask, 'pkg', [] ],
 
-            [ :FileCreationTask, "#{folder_base}_SOURCE", source_files ],
+            [ :FileTask, "#{folder_base}_SOURCE", source_files ],
             [ :FileTask, "#{folder_base}_SOURCE.7z", ["#{folder_base}_SOURCE"] ],
             [ :FileTask, "#{folder_base}_SOURCE.zip", ["#{folder_base}_SOURCE"] ],
 
-            [ :FileCreationTask, "#{folder_base}_OSX", source_files + ["../wrappers/gosu-mac-wrapper-0.7.41.tar.gz"] ],
+            [ :FileTask, "#{folder_base}_OSX", source_files + ["../wrappers/gosu-mac-wrapper-0.7.41.tar.gz"] ],
             [ :FileTask, "#{folder_base}_OSX.7z", ["#{folder_base}_OSX" ] ],
             [ :FileTask, "#{folder_base}_OSX.zip", ["#{folder_base}_OSX"] ],
 
-            [ :FileCreationTask, "#{folder_base}_WIN32_INSTALLER", source_files ],
+            [ :FileTask, "#{folder_base}_WIN32_INSTALLER", source_files ],
             [ :FileTask, "#{folder_base}_WIN32_INSTALLER.7z", ["#{folder_base}_WIN32_INSTALLER"] ],
             [ :FileTask, "#{folder_base}_WIN32_INSTALLER.zip", ["#{folder_base}_WIN32_INSTALLER"] ],
         ]
@@ -290,7 +290,7 @@ context Releasy::Project do
             b.add_package :tar_gz do |a|
               a.extension = ".tgz"
             end
-            b.wrapper = Dir["../wrappers/gosu-mac-wrapper-*.tar.gz"].first
+            b.wrapper = "../wrappers/gosu-mac-wrapper-0.7.41.tar.gz"
             b.url = "org.url.app"
           end
           p.add_build :windows_standalone do |b|

data/test/teststrap.rb

@@ -7,6 +7,12 @@ require 'fileutils'
 $LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
 require 'releasy'
 
+if ARGV.include? "--verbose" or ARGV.include? "-v"
+  Riot.verbose
+else
+  Riot.pretty_dots
+end
+
 def source_files
   %w[bin/test_app lib/test_app.rb lib/test_app/stuff.rb README.txt LICENSE.txt Gemfile.lock Gemfile]
 end

data/test/yard_test.rb

@@ -44,7 +44,7 @@ context "YARD @examples" do
       object.tags(:example).each_with_index {|e, i| run_riot e.text, i, e.object.to_s }
       object.meths(:inherited => false, :included => false).each do |method|
         process_method(method)
-        method.tags(:overload).each_with_index {|overload| process_method(overload) }
+        method.tags(:overload).each {|overload| process_method(overload) }
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: releasy
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-28 00:00:00.000000000 Z
+date: 2012-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ocra
-  requirement: &22502412 !ruby/object:Gem::Requirement
+  requirement: &25229604 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *22502412
+  version_requirements: *25229604
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &22500432 !ruby/object:Gem::Requirement
+  requirement: &25229088 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.9.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *22500432
+  version_requirements: *25229088
 - !ruby/object:Gem::Dependency
   name: cri
-  requirement: &22498248 !ruby/object:Gem::Requirement
+  requirement: &25228260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *22498248
+  version_requirements: *25228260
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &21878016 !ruby/object:Gem::Requirement
+  requirement: &28431360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,21 +54,21 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *21878016
+  version_requirements: *28431360
 - !ruby/object:Gem::Dependency
   name: net-github-upload
-  requirement: &21877176 !ruby/object:Gem::Requirement
+  requirement: &28430268 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 0.0.8
   type: :runtime
   prerelease: false
-  version_requirements: *21877176
+  version_requirements: *28430268
 - !ruby/object:Gem::Dependency
   name: riot
-  requirement: &21876108 !ruby/object:Gem::Requirement
+  requirement: &28429836 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.12.5
   type: :development
   prerelease: false
-  version_requirements: *21876108
+  version_requirements: *28429836
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &21874980 !ruby/object:Gem::Requirement
+  requirement: &28429476 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.0.4
   type: :development
   prerelease: false
-  version_requirements: *21874980
+  version_requirements: *28429476
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &22417668 !ruby/object:Gem::Requirement
+  requirement: &28429164 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 0.7.4
   type: :development
   prerelease: false
-  version_requirements: *22417668
+  version_requirements: *28429164
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &22430232 !ruby/object:Gem::Requirement
+  requirement: &28428780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,7 +109,7 @@ dependencies:
         version: 2.0.1
   type: :development
   prerelease: false
-  version_requirements: *22430232
+  version_requirements: *28428780
 description: ! 'Releasy helps to make Ruby application releases simpler, by creating
   and archiving source folders, Windows folders,
 
@@ -131,6 +131,9 @@ files:
 - README.md
 - Rakefile
 - bin/7z.sfx
+- bin/7z_sfx_LICENSE.txt
+- bin/7za.exe
+- bin/7za_exe_LICENSE.txt
 - bin/releasy
 - lib/releasy.rb
 - lib/releasy/builders.rb
@@ -148,13 +151,15 @@ files:
 - lib/releasy/deployers.rb
 - lib/releasy/deployers/deployer.rb
 - lib/releasy/deployers/github.rb
+- lib/releasy/deployers/local.rb
+- lib/releasy/deployers/rsync.rb
 - lib/releasy/dsl_wrapper.rb
 - lib/releasy/mixins/can_exclude_encoding.rb
-- lib/releasy/mixins/exec.rb
 - lib/releasy/mixins/has_gemspecs.rb
 - lib/releasy/mixins/has_packagers.rb
 - lib/releasy/mixins/log.rb
 - lib/releasy/mixins/register.rb
+- lib/releasy/mixins/utilities.rb
 - lib/releasy/packagers.rb
 - lib/releasy/packagers/dmg.rb
 - lib/releasy/packagers/exe.rb
@@ -174,11 +179,12 @@ files:
 - test/releasy/builders/data/Main.rb
 - test/releasy/builders/data/relapse_runner.rb
 - test/releasy/builders/data/set_app_executable.sh
+- test/releasy/builders/helpers/builder_helper.rb
 - test/releasy/builders/helpers/helper.rb
-- test/releasy/builders/ocra_builder_test.rb
+- test/releasy/builders/helpers/ocra_builder_helper.rb
+- test/releasy/builders/helpers/windows_builder_helper.rb
 - test/releasy/builders/osx_app_test.rb
 - test/releasy/builders/source_test.rb
-- test/releasy/builders/windows_builder_test.rb
 - test/releasy/builders/windows_folder_test.rb
 - test/releasy/builders/windows_installer_test.rb
 - test/releasy/builders/windows_standalone_test.rb
@@ -186,10 +192,14 @@ files:
 - test/releasy/cli/install_sfx_test.rb
 - test/releasy/deployers/github_test.rb
 - test/releasy/deployers/helpers/helper.rb
+- test/releasy/deployers/local_test.rb
+- test/releasy/deployers/rsync_test.rb
 - test/releasy/dsl_wrapper_test.rb
 - test/releasy/integration/source_test.rb
 - test/releasy/mixins/log_test.rb
 - test/releasy/mixins/register_test.rb
+- test/releasy/mixins/utilities_test.rb
+- test/releasy/packagers/packager_test.rb
 - test/releasy/packagers_test.rb
 - test/releasy/project_test.rb
 - test/releasy/windows_wrapper_maker_test.rb
@@ -220,7 +230,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -77117219
+      hash: 963582929
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -229,7 +239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -77117219
+      hash: 963582929
 requirements:
 - 7z (optional; used to generate archives)
 - InnoSetup (optional on Windows; used to make Win32 installer)
@@ -239,20 +249,22 @@ signing_key:
 specification_version: 3
 summary: Releasy helps to make Ruby application releases simpler
 test_files:
-- test/releasy/builders/ocra_builder_test.rb
 - test/releasy/builders/osx_app_test.rb
 - test/releasy/builders/source_test.rb
-- test/releasy/builders/windows_builder_test.rb
 - test/releasy/builders/windows_folder_test.rb
 - test/releasy/builders/windows_installer_test.rb
 - test/releasy/builders/windows_standalone_test.rb
 - test/releasy/builders/windows_wrapped_test.rb
 - test/releasy/cli/install_sfx_test.rb
 - test/releasy/deployers/github_test.rb
+- test/releasy/deployers/local_test.rb
+- test/releasy/deployers/rsync_test.rb
 - test/releasy/dsl_wrapper_test.rb
 - test/releasy/integration/source_test.rb
 - test/releasy/mixins/log_test.rb
 - test/releasy/mixins/register_test.rb
+- test/releasy/mixins/utilities_test.rb
+- test/releasy/packagers/packager_test.rb
 - test/releasy/packagers_test.rb
 - test/releasy/project_test.rb
 - test/releasy/windows_wrapper_maker_test.rb