releasy 0.2.0rc1 → 0.2.0rc2

data/lib/releasy/version.rb

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

data/lib/releasy/windows_wrapper_maker.rb

@@ -4,9 +4,6 @@ require 'ocra'
 module Releasy
   # Creates wrappers and executables by wrapping Ocra's functionality.
   class WindowsWrapperMaker
-    include FileUtils
-    include FileUtils::Verbose
-
     # Creates an win32 executable file (xxx.exe) that runs via a Ruby executable at bin/ruby(w).exe
     # Paths given to the executable are relative to the directory that the executable is in.
     # Assumes that user's source will be put into _./src/_ and that ruby executables will be in _./bin/_

data/releasy.gemspec

@@ -29,6 +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_development_dependency('riot', '~> 0.12.5')
   s.add_development_dependency('rr', '~> 1.0.4')

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

@@ -7,7 +7,6 @@ def new_project
   project.files = source_files
   project.exposed_files = %w[README.txt LICENSE.txt]
   project.add_link "http://spooner.github.com/libraries/releasy/", "Releasy website"
-  project.quiet
   project.output_path = output_path
 
   project

data/test/releasy/builders/osx_app_test.rb

@@ -18,17 +18,16 @@ if osx_app_wrapper
     end
 
     asserts(:folder_suffix).equals "OSX"
-    asserts(:icon=, "test_app.ico").raises Releasy::ConfigError, /icon must be a .icns file/
+    asserts(:encoding_excluded?).equals false
+    asserts(:icon=, "test_app.ico").raises ArgumentError, /icon must be a .icns file/
     denies(:gemspecs).empty
 
-    context "no wrapper" do
-      hookup do
-        topic.url = "org.frog.fish"
-      end
+    context "#wrapper not set" do
+      hookup { topic.url = "org.frog.fish" }
       asserts(:generate_tasks).raises Releasy::ConfigError, /wrapper not set/
     end
 
-    context "invalid wrapper" do
+    context "#wrapper invalid" do
       hookup do
         topic.url = "org.frog.fish"
         topic.wrapper = "whatever"
@@ -37,10 +36,17 @@ if osx_app_wrapper
       asserts(:generate_tasks).raises Releasy::ConfigError, /wrapper not valid/
     end
 
-    context "no url" do
+    context "#wrapper does not exist" do
       hookup do
-        topic.wrapper = osx_app_wrapper
+        topic.url = "org.frog.fish"
+        topic.wrapper = "gosu-mac-wrapper-0.0.00.tar.gz"
       end
+
+      asserts(:build).raises Releasy::ConfigError, /wrapper file does not exist:/
+    end
+
+    context "no url" do
+      hookup { topic.wrapper = osx_app_wrapper }
       asserts(:generate_tasks).raises Releasy::ConfigError, /url not set/
     end
 
@@ -50,6 +56,7 @@ if osx_app_wrapper
         topic.wrapper = osx_app_wrapper
         topic.icon = "test_app.icns"
         topic.gemspecs = gemspecs_to_use
+        topic.exclude_encoding
         topic.send :generate_tasks
       end
 
@@ -98,6 +105,9 @@ if osx_app_wrapper
 
         denies("default chingu gem left in app")  { File.exists?("#{app_folder}/Contents/Resources/lib/chingu") }
 
+        helper(:enc_folder) { "#{app_folder}/Contents/Resources/lib/enc" }
+        asserts("remaining encoding files") { Dir["#{enc_folder}/**/*.bundle"].map {|f| f[(enc_folder.size + 1)..-1] } }.same_elements %w[encdb.bundle iso_8859_1.bundle utf_16le.bundle trans/single_byte.bundle trans/transdb.bundle trans/utf_16_32.bundle]
+
         if RUBY_PLATFORM =~ /darwin/
           asserts("program output") { clear_all_env { %x["./#{app_folder}/Contents/MacOS/Test App"] } }.equals "test run!\n"
         end

data/test/releasy/builders/{windows_folder_from_ruby_dist_test.rb → windows_wrapped_test.rb}

@@ -2,11 +2,11 @@ require File.expand_path("helpers/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+/]
-  suffix = "WIN32_FROM_RUBY_DIST_#{ruby_version.tr(".", "_")}"
+  suffix = "WIN32_WRAPPED_#{ruby_version.tr(".", "_")}"
   folder = File.join(output_path, "test_app_0_1_#{suffix}")
 
-  context "#{Releasy::Builders::WindowsFolderFromRubyDist} for #{ruby_version}" do
-    setup { Releasy::Builders::WindowsFolderFromRubyDist.new new_project }
+  context "#{Releasy::Builders::WindowsWrapped} for #{ruby_version}" do
+    setup { Releasy::Builders::WindowsWrapped.new new_project }
 
     teardown do
       Dir.chdir $original_path
@@ -17,9 +17,9 @@ Dir[File.expand_path("wrappers/ruby-*.7z", $original_path)].each do |path_to_rub
       Dir.chdir project_path
     end
 
-    asserts(:ruby_dist).nil
+    asserts(:wrapper).nil
     asserts(:folder_suffix).equals "WIN32"
-    asserts(:generate_tasks).raises Releasy::ConfigError, /ruby_dist not set/
+    asserts(:generate_tasks).raises Releasy::ConfigError, /wrapper not set/
     denies(:gemspecs).empty
 
     if Gem.win_platform?
@@ -28,18 +28,20 @@ Dir[File.expand_path("wrappers/ruby-*.7z", $original_path)].each do |path_to_rub
       asserts(:valid_for_platform?)
     end
 
-    context "invalid ruby_dist" do
-      hookup do
-        topic.ruby_dist = "ruby_dist"
-      end
+    context "#wrapper invalid" do
+      hookup { topic.wrapper = "wrapper" }
+      asserts(:generate_tasks).raises Releasy::ConfigError, /wrapper not valid/
+    end
 
-      asserts(:generate_tasks).raises Releasy::ConfigError, /ruby_dist not valid/
+    context "#wrapper doesn't exist" do
+      hookup { topic.wrapper = "ruby-1.9.0-p999-i386-mingw32.7z" }
+      asserts(:build).raises Releasy::ConfigError, /wrapper does not exist/
     end
 
     context "valid" do
       hookup do
         stub(topic).valid_for_platform?.returns(true) # Need to do this so we can test on all platforms.
-        topic.ruby_dist = path_to_ruby_dist
+        topic.wrapper = path_to_ruby_dist
         topic.folder_suffix = suffix
         topic.executable_type = :console
         topic.gemspecs = gemspecs_to_use
@@ -50,12 +52,12 @@ Dir[File.expand_path("wrappers/ruby-*.7z", $original_path)].each do |path_to_rub
 
       asserts(:output_path).equals output_path
       asserts(:folder_suffix).equals suffix
-      asserts(:ruby_dist).equals path_to_ruby_dist
+      asserts(:wrapper).equals path_to_ruby_dist
       asserts("gemspecs correct") { topic.gemspecs == gemspecs_to_use }
 
       context "tasks" do
         tasks = [
-            [ :Task, "build:windows:folder_from_ruby_dist", [folder] ],
+            [ :Task, "build:windows:wrapped", [folder] ],
             [ :FileTask, '..', [] ], # byproduct of using #directory
             [ :FileTask, output_path, [] ], # byproduct of using #directory
             [ :FileTask, folder, source_files + [path_to_ruby_dist]],
@@ -65,7 +67,7 @@ Dir[File.expand_path("wrappers/ruby-*.7z", $original_path)].each do |path_to_rub
       end
 
       context "generate" do
-        hookup { Rake::Task["build:windows:folder_from_ruby_dist"].invoke }
+        hookup { Rake::Task["build:windows:wrapped"].invoke }
 
         asserts("files copied to folder") { source_files.all? {|f| same_contents? "#{folder}/src/#{f}", f } }
         asserts("readme copied to folder") { same_contents? "#{folder}/README.txt", "README.txt" }

data/test/releasy/deployers/github_test.rb

@@ -0,0 +1,133 @@
+require File.expand_path("helpers/helper", File.dirname(__FILE__))
+require 'net/github-upload' # Because this isn't otherwise loaded until it is needed.
+
+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
+
+    Releasy::Deployers::Github.new new_project
+  end
+
+  teardown do
+    Dir.chdir $original_path
+    Rake::Task.clear
+  end
+
+  hookup do
+    Dir.chdir project_path
+  end
+
+  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
+
+      Releasy::Deployers::Github.new new_project
+    end
+
+    asserts(:repository).equals "test_app"
+  end
+
+  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
+
+      Releasy::Deployers::Github.new new_project
+    end
+
+    asserts(:repository).equals "test-app"
+  end
+
+  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
+
+      Releasy::Deployers::Github.new new_project
+    end
+
+    asserts(:user).nil
+
+    asserts(:deploy, "file").raises Releasy::ConfigError, /#user must be set manually if it is not configured on the system/
+  end
+
+  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
+      Releasy::Deployers::Github.new new_project
+    end
+
+    asserts(:token).nil
+
+    asserts(:deploy, "file").raises Releasy::ConfigError, /#token must be set manually if it is not configured on the system/
+  end
+
+
+  context "valid" do
+    context "#generate_tasks" do
+      hookup { topic.send :generate_tasks, "source:7z", "SOURCE.7z", ".7z" }
+      tasks = [
+          [ :Task, "deploy:source:7z:github", %w[package:source:7z] ],
+      ]
+
+      test_tasks tasks
+    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
+        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
+        end
+
+        topic.send :deploy, "file.zip"
+
+        true
+      end
+
+      should "expect an Net::GitHub::Upload to be created and exit (not forcing replacement and file already exists)" do
+        stub_file_size
+        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 do
+            raise "file already exists"
+          end
+        end
+
+        mock(topic).exit(1)
+
+        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
+        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 => true
+        end
+
+        topic.replace!
+        topic.send :deploy, "file.zip"
+
+        true
+      end
+    end
+  end
+end

data/test/releasy/deployers/helpers/helper.rb

@@ -0,0 +1,19 @@
+require File.expand_path("../../../teststrap", File.dirname(__FILE__))
+
+def new_project
+  project = Releasy::Project.new
+  project.name = "Test App"
+  project.version = "0.1"
+  project.files = source_files
+  project.exposed_files = %w[README.txt LICENSE.txt]
+  project.add_link "http://spooner.github.com/libraries/releasy/", "Releasy website"
+  project.output_path = output_path
+
+  project.add_build :source
+
+  project.add_package :"7z"
+
+  project
+end
+
+def archive_file; "test_app_0_1_SOURCE.7z"; end

data/test/releasy/integration/source_test.rb

@@ -20,14 +20,16 @@ context "Source in all formats" do
       create_md5s
 
       add_build :source do
-        add_archive :dmg
-        add_archive :exe
-        add_archive :zip
-        add_archive :"7z"
+        add_package :dmg
+        add_package :exe
+        add_package :zip
+        add_package :"7z"
       end
 
-      add_archive :tar_gz
-      add_archive :tar_bz2
+      add_package :tar_gz
+      add_package :tar_bz2
+
+      add_deploy :github
     end
   end
 
@@ -46,6 +48,23 @@ context "Source in all formats" do
 
   context "tasks" do
     tasks = [
+        [ :Task, "deploy", %w[deploy:source] ],
+        [ :Task, "deploy:github", %w[deploy:source:github] ],
+        [ :Task, "deploy:source", %w[deploy:source:github] ],
+        [ :Task, "deploy:source:github", %w[deploy:source:dmg:github deploy:source:7z:github deploy:source:exe:github deploy:source:tar_gz:github deploy:source:tar_bz2:github deploy:source:zip:github] ],
+        [ :Task, "deploy:source:dmg", %w[deploy:source:dmg:github] ],
+        [ :Task, "deploy:source:dmg:github", %w[package:source:dmg] ],
+        [ :Task, "deploy:source:7z", %w[deploy:source:7z:github] ],
+        [ :Task, "deploy:source:7z:github", %w[package:source:7z] ],
+        [ :Task, "deploy:source:exe", %w[deploy:source:exe:github] ],
+        [ :Task, "deploy:source:exe:github", %w[package:source:exe] ],
+        [ :Task, "deploy:source:tar_gz", %w[deploy:source:tar_gz:github] ],
+        [ :Task, "deploy:source:tar_gz:github", %w[package:source:tar_gz] ],
+        [ :Task, "deploy:source:tar_bz2", %w[deploy:source:tar_bz2:github] ],
+        [ :Task, "deploy:source:tar_bz2:github", %w[package:source:tar_bz2] ],
+        [ :Task, "deploy:source:zip", %w[deploy:source:zip:github] ],
+        [ :Task, "deploy:source:zip:github", %w[package:source:zip] ],
+
         [ :Task, "package", %w[package:source] ],
         [ :Task, "package:source", %w[package:source:dmg package:source:7z package:source:exe package:source:tar_gz package:source:tar_bz2 package:source:zip] ],
         [ :Task, "package:source:dmg", ["#{folder}.dmg"] ],

data/test/releasy/mixins/log_test.rb

@@ -0,0 +1,15 @@
+require File.expand_path("../../teststrap", File.dirname(__FILE__))
+
+context Releasy::Mixins::Log do
+  setup { Releasy::Mixins::Log }
+
+  asserts(:log_level=, :fish).raises ArgumentError, "Bad log_level: :fish"
+
+  context "included" do
+    setup { Object.new.extend topic }
+
+    asserts_topic.respond_to :heading
+    asserts_topic.respond_to :info
+    asserts_topic.respond_to :warn
+  end
+end

data/test/releasy/mixins/register_test.rb

@@ -20,7 +20,6 @@ context Releasy::Mixins::Register do
   end
 
   asserts("trying to register a non-class") { topic.register 12 }.raises TypeError, /Can only register classes/
-  asserts("trying to register a class not within the module") { topic.register NotInModule }.raises ArgumentError, /Can't register a class not within this module/
   asserts("trying to register a class without TYPE, even if in the module") { topic.register topic::Untyped }.raises ArgumentError, /To register, a class must have TYPE defined/
 
   context "with registered classes (blue and red frogs)" do

data/test/releasy/{archivers_test.rb → packagers_test.rb}

@@ -1,22 +1,22 @@
 require File.expand_path("../teststrap", File.dirname(__FILE__))
 
-# Test all archivers at once, since they are pretty much identical.
+# Test all packagers at once, since they are pretty much identical.
 [
-    [:dmg,     Releasy::Archivers::Dmg,      %[GZIP=-9 hdiutil create -fs HFS+ -srcfolder "f" -volname "Test App 0.1" "f.dmg"]],
-    [:exe,     Releasy::Archivers::Exe,      %[7z a -mmt -bd -t7z -mx9 -sfx7z.sfx "f.exe" "f"]],
-    [:"7z",    Releasy::Archivers::SevenZip, %[7z a -mmt -bd -t7z -mx9 "f.7z" "f"]],
-    [:tar_bz2, Releasy::Archivers::TarBzip2, %[7z a -so -mmt -bd -ttar "f.tar" "f" | 7z a -si -bd -tbzip2 -mx9 "f.tar.bz2"]],
-    [:tar_gz,  Releasy::Archivers::TarGzip,  %[7z a -so -mmt -bd -ttar "f.tar" "f" | 7z a -si -bd -tgzip -mx9 "f.tar.gz"]],
-    [:zip,     Releasy::Archivers::Zip,      %[7z a -mmt -bd -tzip -mx9 "f.zip" "f"]],
-].each do |type, archiver, command|
+    [: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"]],
+].each do |type, packager, command|
   extension = "." + type.to_s.tr("_", ".")
 
-  context archiver do
+  context packager do
     setup do
       project = Releasy::Project.new
       project.name = "Test App"
       project.version = "0.1"
-      archiver.new project
+      packager.new project
     end
     teardown { Rake::Task.clear }
 
@@ -32,15 +32,12 @@ require File.expand_path("../teststrap", File.dirname(__FILE__))
       asserts(:package, "f").equals "f.wobble"
     end
 
-    context "setting extension without a . still adds one" do
-      hookup { topic.extension = "wobble" }
-
-      asserts(:extension).equals "wobble"
-      asserts(:package, "f").equals "f.wobble"
+    context "setting extension without a . raises an error" do
+      asserts(:extension=, "wobble").raises ArgumentError, /extension must be valid/
     end
 
     context "generated tasks" do
-      hookup { topic.send :generate_tasks, "source", "frog" }
+      hookup { topic.send :generate_tasks, "source", "frog", [] }
 
       tasks = [
           [:FileTask, "frog#{extension}", %w[frog]],
@@ -53,11 +50,11 @@ require File.expand_path("../teststrap", File.dirname(__FILE__))
     context "class" do
       setup { topic.class }
 
-      asserts("#{archiver}::TYPE") { topic::TYPE }.equals type
+      asserts("#{packager}::TYPE") { topic::TYPE }.equals type
 
       if type == :exe
-        asserts("#{archiver}::SFX_NAME") { topic::SFX_NAME }.equals "7z.sfx"
-        asserts("#{archiver}::SFX_FILE") { topic::SFX_FILE }.equals File.expand_path("bin/7z.sfx", $original_path)
+        asserts("#{packager}::SFX_NAME") { topic::SFX_NAME }.equals "7z.sfx"
+        asserts("#{packager}::SFX_FILE") { topic::SFX_FILE }.equals File.expand_path("bin/7z.sfx", $original_path)
         asserts("sfx file included") { File.exists? topic::SFX_FILE }
       end
     end