releasy 0.2.0rc1 → 0.2.0rc2

data/test/releasy/project_test.rb

@@ -20,43 +20,43 @@ context Releasy::Project do
     asserts(:name).nil
     asserts(:underscored_name).nil
     asserts(:version).nil
+    asserts(:description).nil
+    asserts(:underscored_description).nil
     asserts(:executable).nil
     asserts(:files).empty
     asserts(:files).kind_of Rake::FileList
     asserts(:exposed_files).empty
     asserts(:exposed_files).kind_of Rake::FileList
-    asserts(:verbose?).equals true
     asserts(:links).equals Hash.new
     asserts(:create_md5s?).equals false
+    asserts(:encoding_excluded?).equals false
 
     asserts(:to_s).equals "<Releasy::Project>"
     asserts(:output_path).equals "pkg"
     asserts(:folder_base).equals "pkg/" # Would be more, but dependent on name.
 
-    asserts("attempting to generate tasks without any outputs") { topic.send :generate_tasks }.raises Releasy::ConfigError, /must specify at least one valid output/i
+    asserts("attempting to generate tasks without any outputs") { topic.send :generate_tasks }.raises Releasy::ConfigError, /Must use #add_build at least once before tasks can be generated/i
 
     asserts(:active_builders).empty
     asserts(:add_build, :source).kind_of Releasy::Builders::Source
     asserts(:active_builders).size 1
-    asserts(:add_build, :source).raises(Releasy::ConfigError, /already have output :source/i)
+    asserts(:add_build, :source).raises(ArgumentError, /already have output :source/i)
     asserts(:add_build, :unknown).raises(ArgumentError, /unsupported output/i)
 
-    asserts("active_archivers") { topic.send(:active_archivers, topic.send(:active_builders).first) }.empty
-    asserts(:add_archive, :zip).kind_of Releasy::Archivers::Zip
-    asserts("active_archivers") { topic.send(:active_archivers, topic.send(:active_builders).first) }.size 1
-    asserts(:add_archive, :zip).raises(Releasy::ConfigError, /already have archive format :zip/i)
-    asserts(:add_archive, :unknown).raises(ArgumentError, /unsupported archive/i)
+    asserts("active_packagers") { topic.send(:active_packagers, topic.send(:active_builders).first) }.empty
+    asserts(:add_package, :zip).kind_of Releasy::Packagers::Zip
+    asserts("active_packagers") { topic.send(:active_packagers, topic.send(:active_builders).first) }.size 1
+    asserts(:add_package, :zip).raises(ArgumentError, /already have archive format :zip/i)
+    asserts(:add_package, :unknown).raises(ArgumentError, /unsupported archive/i)
 
     context "#verbose" do
-      hookup { topic.quiet }
       hookup { topic.verbose }
-      asserts(:verbose?).equals true
+      asserts(:log_level).equals :verbose
     end
 
-    context "#quiet" do
-      hookup { topic.verbose }
-      hookup { topic.quiet }
-      asserts(:verbose?).equals false
+    context "#silent" do
+      hookup { topic.silent }
+      asserts(:log_level).equals :silent
     end
 
     context "#create_md5s" do
@@ -83,13 +83,14 @@ context Releasy::Project do
         name "Test Project - (2a)"
         version "v0.1.5"
 
-        add_archive :"7z"
-        add_archive :zip
+        add_package :"7z"
+        add_package :zip
+        exclude_encoding
 
         add_build :source
         add_build :osx_app do
-          add_archive :tar_gz do
-            extension "tgz"
+          add_package :tar_gz do
+            extension ".tgz"
           end
           wrapper Dir["../wrappers/gosu-mac-wrapper-*.tar.gz"].first
           url "org.url.app"
@@ -105,21 +106,24 @@ context Releasy::Project do
       end
     end
 
+    asserts(:encoding_excluded?).equals true
     asserts(:to_s).equals %[<Releasy::Project Test Project - (2a) v0.1.5>]
     asserts(:name).equals "Test Project - (2a)"
     asserts(:underscored_name).equals "test_project_2a"
     asserts(:version).equals "v0.1.5"
     asserts("file") { topic.files.to_a }.same_elements source_files
     asserts(:underscored_version).equals "v0_1_5"
+    asserts(:description).equals "Test Project - (2a) v0.1.5"
+    asserts(:underscored_description).equals "test_project_2a_v0_1_5"
     asserts(:executable).equals "bin/test_project_2a"
     asserts(:folder_base).equals "pkg/test_project_2a_v0_1_5"
     asserts(:links).equals "www.frog.com" => "Frog", "www2.fish.com" => "Fish"
 
     asserts(:active_builders).size(Gem.win_platform? ? 3 : 2)
-    asserts("source active_archivers") { topic.send(:active_archivers, topic.send(:active_builders).find {|b| b.type == :source }) }.size 2
-    asserts("osx app active_archivers") { topic.send(:active_archivers, topic.send(:active_builders).find {|b| b.type == :osx_app }) }.size 3
+    asserts("source active_packagers") { topic.send(:active_packagers, topic.send(:active_builders).find {|b| b.type == :source }) }.size 2
+    asserts("osx app active_packagers") { topic.send(:active_packagers, topic.send(:active_builders).find {|b| b.type == :osx_app }) }.size 3
     if Gem.win_platform?
-      asserts("Windows standalone active_archivers") { topic.send(:active_archivers, topic.send(:active_builders).find {|b| b.type == :windows_standalone }) }.size 2
+      asserts("Windows standalone active_packagers") { topic.send(:active_packagers, topic.send(:active_builders).find {|b| b.type == :windows_standalone }) }.size 2
     end
 
     asserts "add_build yields an instance_eval-ed Releasy::DSLWrapper" do
@@ -130,10 +134,10 @@ context Releasy::Project do
       correct
     end
 
-    asserts "add_archive yields an instance_eval-ed Releasy::DSLWrapper" do
+    asserts "add_package yields an instance_eval-ed Releasy::DSLWrapper" do
       correct = false
-      topic.add_archive :tar_gz do
-        correct = (is_a?(Releasy::DSLWrapper) and owner.is_a?(Releasy::Archivers::TarGzip))
+      topic.add_package :tar_gz do
+        correct = (is_a?(Releasy::DSLWrapper) and owner.is_a?(Releasy::Packagers::TarGzip))
       end
       correct
     end
@@ -141,9 +145,9 @@ context Releasy::Project do
     context "#generate_archive_tasks" do
       asserts(:generate_archive_tasks).equals { topic }
 
-      should "call generate_tasks on all archivers" do
+      should "call generate_tasks on all packagers" do
         topic.send(:active_builders).each do |builder|
-          topic.send(:active_archivers, builder).each {|a| mock(a).generate_tasks(builder.type.to_s.sub('_', ':'), builder.send(:folder)) }
+          topic.send(:active_packagers, builder).each {|a| mock(a).generate_tasks(builder.type.to_s.sub('_', ':'), builder.send(:folder), []) }
         end
         topic.send :generate_archive_tasks
       end
@@ -169,12 +173,12 @@ context Releasy::Project do
           p.name = "Test Project - (2a)"
           p.version = "v0.1.5"
 
-          p.add_archive :"7z"
-          p.add_archive :zip
+          p.add_package :"7z"
+          p.add_package :zip
 
           p.add_build :source
           p.add_build :osx_app do |b|
-            b.add_archive :tar_gz do |a|
+            b.add_package :tar_gz do |a|
               a.extension = ".tgz"
             end
             b.wrapper = Dir["../wrappers/gosu-mac-wrapper-*.tar.gz"].first

data/test/teststrap.rb

@@ -39,13 +39,15 @@ $original_path = Dir.pwd
 
 def output_path; "../test_output"; end
 
+Releasy::Mixins::Log.log_level = :silent
+
 # Ensure that the output directory is clean before starting tests, but don't do it for every test.
 output_dir = "test_output"
 if File.directory? output_dir
   puts "Deleting existing test outputs"
   rm_r FileList["#{output_dir}/*"], :verbose => false
 else
-  mkdir output_dir
+  mkdir output_dir, :verbose => false
 end
 
 

data/test/yard_test.rb

@@ -50,7 +50,7 @@ context "YARD @examples" do
   end
 end
 
-module AlphaChannel
+module MyApplication
   VERSION = "1.2.2"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: releasy
 version: !ruby/object:Gem::Version
-  version: 0.2.0rc1
+  version: 0.2.0rc2
   prerelease: 5
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-25 00:00:00.000000000 Z
+date: 2012-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ocra
-  requirement: &3178992 !ruby/object:Gem::Requirement
+  requirement: &22452180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *3178992
+  version_requirements: *22452180
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &3191196 !ruby/object:Gem::Requirement
+  requirement: &22451748 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.9.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *3191196
+  version_requirements: *22451748
 - !ruby/object:Gem::Dependency
   name: cri
-  requirement: &3188400 !ruby/object:Gem::Requirement
+  requirement: &22451352 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *3188400
+  version_requirements: *22451352
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &3201468 !ruby/object:Gem::Requirement
+  requirement: &22450980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,21 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *3201468
+  version_requirements: *22450980
+- !ruby/object:Gem::Dependency
+  name: net-github-upload
+  requirement: &22450644 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.7
+  type: :runtime
+  prerelease: false
+  version_requirements: *22450644
 - !ruby/object:Gem::Dependency
   name: riot
-  requirement: &3209964 !ruby/object:Gem::Requirement
+  requirement: &22450260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +76,10 @@ dependencies:
         version: 0.12.5
   type: :development
   prerelease: false
-  version_requirements: *3209964
+  version_requirements: *22450260
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &3208116 !ruby/object:Gem::Requirement
+  requirement: &22449912 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +87,10 @@ dependencies:
         version: 1.0.4
   type: :development
   prerelease: false
-  version_requirements: *3208116
+  version_requirements: *22449912
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &3207192 !ruby/object:Gem::Requirement
+  requirement: &22449552 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +98,10 @@ dependencies:
         version: 0.7.4
   type: :development
   prerelease: false
-  version_requirements: *3207192
+  version_requirements: *22449552
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &3206124 !ruby/object:Gem::Requirement
+  requirement: &22449180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,7 +109,7 @@ dependencies:
         version: 2.0.1
   type: :development
   prerelease: false
-  version_requirements: *3206124
+  version_requirements: *22449180
 description: ! 'Releasy helps to make Ruby application releases simpler, by creating
   and archiving source folders, Windows folders,
 
@@ -122,15 +133,6 @@ files:
 - bin/7z.sfx
 - bin/releasy
 - lib/releasy.rb
-- lib/releasy/archivers.rb
-- lib/releasy/archivers/archiver.rb
-- lib/releasy/archivers/dmg.rb
-- lib/releasy/archivers/exe.rb
-- lib/releasy/archivers/seven_zip.rb
-- lib/releasy/archivers/tar_archiver.rb
-- lib/releasy/archivers/tar_bzip2.rb
-- lib/releasy/archivers/tar_gzip.rb
-- lib/releasy/archivers/zip.rb
 - lib/releasy/builders.rb
 - lib/releasy/builders/builder.rb
 - lib/releasy/builders/ocra_builder.rb
@@ -138,23 +140,36 @@ files:
 - lib/releasy/builders/source.rb
 - lib/releasy/builders/windows_builder.rb
 - lib/releasy/builders/windows_folder.rb
-- lib/releasy/builders/windows_folder_from_ruby_dist.rb
 - lib/releasy/builders/windows_installer.rb
 - lib/releasy/builders/windows_standalone.rb
+- lib/releasy/builders/windows_wrapped.rb
 - lib/releasy/cli.rb
 - lib/releasy/cli/install_sfx.rb
+- lib/releasy/deployers.rb
+- lib/releasy/deployers/deployer.rb
+- lib/releasy/deployers/github.rb
 - lib/releasy/dsl_wrapper.rb
+- lib/releasy/mixins/can_exclude_encoding.rb
 - lib/releasy/mixins/exec.rb
-- lib/releasy/mixins/has_archivers.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/packagers.rb
+- lib/releasy/packagers/dmg.rb
+- lib/releasy/packagers/exe.rb
+- lib/releasy/packagers/packager.rb
+- lib/releasy/packagers/seven_zip.rb
+- lib/releasy/packagers/tar_bzip2.rb
+- lib/releasy/packagers/tar_gzip.rb
+- lib/releasy/packagers/tar_packager.rb
+- lib/releasy/packagers/zip.rb
 - lib/releasy/project.rb
 - lib/releasy/version.rb
 - lib/releasy/windows_wrapper_maker.rb
 - lib/releasy/windows_wrapper_maker/Gemfile
 - media/releasy.png
 - releasy.gemspec
-- test/releasy/archivers_test.rb
 - test/releasy/builders/data/Info.plist
 - test/releasy/builders/data/Main.rb
 - test/releasy/builders/data/relapse_runner.rb
@@ -164,14 +179,18 @@ files:
 - 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_from_ruby_dist_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/helpers/helper.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/packagers_test.rb
 - test/releasy/project_test.rb
 - test/releasy/windows_wrapper_maker_test.rb
 - test/teststrap.rb
@@ -201,7 +220,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 921787251
+      hash: 710558637
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -217,19 +236,21 @@ signing_key:
 specification_version: 3
 summary: Releasy helps to make Ruby application releases simpler
 test_files:
-- test/releasy/archivers_test.rb
 - 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_from_ruby_dist_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/dsl_wrapper_test.rb
 - test/releasy/integration/source_test.rb
+- test/releasy/mixins/log_test.rb
 - test/releasy/mixins/register_test.rb
+- test/releasy/packagers_test.rb
 - test/releasy/project_test.rb
 - test/releasy/windows_wrapper_maker_test.rb
 - test/yard_test.rb

data/lib/releasy/archivers.rb

@@ -1,12 +0,0 @@
-require 'releasy/mixins/register'
-
-module Releasy
-  # Contains all {Archiver} types.
-  module Archivers
-    extend Mixins::Register
-  end
-end
-
-%w[dmg exe seven_zip tar_bzip2 tar_gzip zip].each do |archiver|
-  require "releasy/archivers/#{archiver}"
-end

data/lib/releasy/archivers/seven_zip.rb

@@ -1,12 +0,0 @@
-require "releasy/archivers/archiver"
-
-module Releasy
-  module Archivers
-    # 7z archive format (LZMA)
-    class SevenZip < Archiver
-      TYPE = :"7z"
-      DEFAULT_EXTENSION = ".7z"
-      Archivers.register self
-    end
-  end
-end

data/lib/releasy/mixins/has_archivers.rb

@@ -1,37 +0,0 @@
-module Releasy
-module Mixins
-  # An object that owns one or more instances of {Archivers::Archiver}
-  module HasArchivers
-    # Add an archive type to be generated for each of your outputs.
-    # @see Project#initialize
-    # @param type [:exe, :"7z", :tar_bz2, :tar_gz, :zip]
-    # @return [Project] self
-    def add_archive(type, &block)
-      raise ArgumentError, "Unsupported archive format #{type.inspect}" unless Archivers.has_type? type
-      raise ConfigError, "Already have archive format #{type.inspect}" if archivers.any? {|a| a.type == type }
-
-      archiver = Archivers[type].new(respond_to?(:project) ? project : self)
-      archivers << archiver
-
-      if block_given?
-        if block.arity == 0
-          DSLWrapper.new(archiver, &block)
-        else
-          yield archiver
-        end
-      end
-
-      archiver
-    end
-
-    protected
-    def archivers; @archivers ||= []; end
-
-    protected
-    # @return [Array<Archiver>]
-    def active_archivers
-      archivers
-    end
-  end
-end
-end