furoshiki 0.1.2 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: d0a17813563822aee7e3ff59e3ed2fd2751ee933
+  data.tar.gz: eea188ad94a3bbfa03fbe232f8b6e8200dcaa85f
+SHA512:
+  metadata.gz: 42e0d0a9be95baf3ff80bda2606708f8240d43726fff18dc6165841278e6b8e1aa6d1f675ccd813e5813be076c4aa3f5a8a9ee18a9141379f980002d4876b19b
+  data.tar.gz: f48f91a79590f621aaaed9ddef6dccb6e0999f9462453345087cd64b64fb3e3ad4206e05934a0caf33761173230567e5d63ebe51de4c95d367de19a45d667da5

data/.ruby-version

@@ -1 +1 @@
-jruby-1.7.4
+jruby-1.7.16

data/furoshiki.gemspec

@@ -16,11 +16,12 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "warbler"
+  s.add_dependency "warbler", '~> 1.4.4'
   s.add_dependency "plist"
-  s.add_dependency 'rubyzip', '< 1.0.0'
+  s.add_dependency 'rubyzip', '>= 1.0.0'
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'
-
+  s.add_development_dependency 'rspec-its'
+  s.add_development_dependency 'pry'
 end

data/lib/furoshiki/shoes/swt_app.rb

@@ -170,12 +170,14 @@ module Furoshiki
       def extract_template
         raise IOError, "Couldn't find app template at #{template_path}." unless template_path.size?
         extracted_app = nil
-        ::Zip::ZipFile.new(template_path).each do |entry|
-          # Fragile hack
-          extracted_app = template_path.join(entry.name) if Pathname.new(entry.name).extname == '.app'
-          p = tmp.join(entry.name)
-          p.dirname.mkpath
-          entry.extract(p)
+
+        ::Zip::File.open(template_path) do |zip_file|
+          zip_file.each do |entry|
+            extracted_app = template_path.join(entry.name) if Pathname.new(entry.name).extname == '.app'
+            p = tmp.join(entry.name)
+            p.dirname.mkpath
+            entry.extract(p)
+          end
         end
         mv tmp.join(extracted_app.basename.to_s), tmp_app_path
       end

data/lib/furoshiki/version.rb

@@ -1,4 +1,4 @@
 module Furoshiki
-  VERSION = "0.1.2"
+  VERSION = '0.2.0'
 end
 

data/lib/furoshiki/zip/recursive.rb

@@ -1,5 +1,5 @@
 require 'pathname'
-require 'zip/zip'
+require 'zip'
 
 module Furoshiki
   module Zip
@@ -15,12 +15,13 @@ module Furoshiki
     # @example
     # To zip the directory "/tmp/input" so that unarchiving
     # gives you a single directory "input":
-    # 
-    #   zip = Furoshiki::Zip::Recursive
+    #
+    #   output_file = '/tmp/out.zip'
+    #
+    #   zip = Furoshiki::Zip::Recursive(output_file)
     #   entries = Pathname.new("/tmp/input").entries
     #   zip_prefix = ''
     #   disk_prefix = '/tmp'
-    #   output_file = '/tmp/out.zip'
     #   zf.write(entries, disk_prefix, zip_prefix, output_file)
     class Recursive
       def initialize(output_file)
@@ -30,9 +31,8 @@ module Furoshiki
       # @param [Array<Pathname>] entries the initial set of files to include
       # @param [Pathname] disk_prefix a path prefix for existing entries
       # @param [Pathname] zip_prefix a path prefix to add within archive
-      # @param [Pathname] output_file the location of the output archive
       def write(entries, disk_prefix, zip_prefix)
-        io = ::Zip::ZipFile.open(@output_file, ::Zip::ZipFile::CREATE); 
+        io = ::Zip::File.open(@output_file, ::Zip::File::CREATE);
         write_entries(entries, disk_prefix, zip_prefix, io)
         io.close();
       end

data/spec/shoes/configuration_spec.rb

@@ -15,35 +15,35 @@ describe Furoshiki::Shoes::Configuration do
     its(:dmg) { should be_an_instance_of(Hash) }
     its(:run) { should be_nil }
     its(:working_dir) { should eq(Pathname.new(Dir.pwd)) }
-    it { should_not be_valid } # no :run
+    it { is_expected.not_to be_valid } # no :run
 
     describe "#icons" do
       it 'osx is nil' do
-        subject.icons[:osx].should be_nil
+        expect(subject.icons[:osx]).to be_nil
       end
 
       it 'gtk is nil' do
-        subject.icons[:gtk].should be_nil
+        expect(subject.icons[:gtk]).to be_nil
       end
 
       it 'win32 is nil' do
-        subject.icons[:win32].should be_nil
+        expect(subject.icons[:win32]).to be_nil
       end
     end
 
     describe "#dmg" do
       it "has ds_store" do
-        subject.dmg[:ds_store].should eq('path/to/default/.DS_Store')
+        expect(subject.dmg[:ds_store]).to eq('path/to/default/.DS_Store')
       end
 
       it "has background" do
-        subject.dmg[:background].should eq('path/to/default/background.png')
+        expect(subject.dmg[:background]).to eq('path/to/default/background.png')
       end
     end
 
     describe "#to_hash" do
       it "round-trips" do
-        Furoshiki::Shoes::Configuration.new(subject.to_hash).should eq(subject)
+        expect(Furoshiki::Shoes::Configuration.new(subject.to_hash)).to eq(subject)
       end
     end
   end
@@ -63,38 +63,38 @@ describe Furoshiki::Shoes::Configuration do
     its(:icons) { should be_an_instance_of(Hash) }
     its(:dmg) { should be_an_instance_of(Hash) }
     its(:working_dir) { should eq(@config_filename.dirname) }
-    it { should be_valid }
+    it { is_expected.to be_valid }
 
     describe "#icons" do
       it 'has osx' do
-        subject.icons[:osx].should eq('img/boots.icns')
+        expect(subject.icons[:osx]).to eq('img/boots.icns')
       end
 
       it 'has gtk' do
-        subject.icons[:gtk].should eq('img/boots_512x512x32.png')
+        expect(subject.icons[:gtk]).to eq('img/boots_512x512x32.png')
       end
 
       it 'has win32' do
-        subject.icons[:win32].should eq('img/boots.ico')
+        expect(subject.icons[:win32]).to eq('img/boots.ico')
       end
     end
 
     describe "#dmg" do
       it "has ds_store" do
-        subject.dmg[:ds_store].should eq('path/to/custom/.DS_Store')
+        expect(subject.dmg[:ds_store]).to eq('path/to/custom/.DS_Store')
       end
 
       it "has background" do
-        subject.dmg[:background].should eq('path/to/custom/background.png')
+        expect(subject.dmg[:background]).to eq('path/to/custom/background.png')
       end
     end
 
     it "incorporates custom features" do
-      subject.custom.should eq('my custom feature')
+      expect(subject.custom).to eq('my custom feature')
     end
 
     it "round-trips" do
-      Furoshiki::Shoes::Configuration.new(subject.to_hash).should eq(subject)
+      expect(Furoshiki::Shoes::Configuration.new(subject.to_hash)).to eq(subject)
     end
   end
 
@@ -110,7 +110,7 @@ describe Furoshiki::Shoes::Configuration do
     let(:options) { {:run => "path/to/non-existent/file"} }
     subject { Furoshiki::Shoes::Configuration.new options }
 
-    it { should_not be_valid }
+    it { is_expected.not_to be_valid }
   end
 
   context "when osx icon is not specified" do
@@ -120,11 +120,11 @@ describe Furoshiki::Shoes::Configuration do
     subject { Furoshiki::Shoes::Configuration.new(options) }
 
     it "sets osx icon path to nil" do
-      subject.icons[:osx].should be_nil
+      expect(subject.icons[:osx]).to be_nil
     end
 
     it "is valid" do
-      subject.should be_valid
+      expect(subject).to be_valid
     end
   end
 
@@ -133,10 +133,10 @@ describe Furoshiki::Shoes::Configuration do
     subject { Furoshiki::Shoes::Configuration.new options }
 
     it "sets osx icon path" do
-      subject.icons[:osx].should eq("path/to/non-existent/file")
+      expect(subject.icons[:osx]).to eq("path/to/non-existent/file")
     end
 
-    it { should_not be_valid }
+    it { is_expected.not_to be_valid }
   end
 
   context "auto-loading" do
@@ -146,13 +146,13 @@ describe Furoshiki::Shoes::Configuration do
       it "looks for 'app.yaml' in current directory" do
         Dir.chdir @config_filename.parent do
           config = Furoshiki::Shoes::Configuration.load
-          config.shortname.should eq('sweet-nebulae')
+          expect(config.shortname).to eq('sweet-nebulae')
         end
       end
 
       it "blows up if it can't find the file" do
         Dir.chdir File.dirname(__FILE__) do
-          lambda { config = Furoshiki::Shoes::Configuration.load }.should raise_error
+          expect { config = Furoshiki::Shoes::Configuration.load }.to raise_error
         end
       end
     end
@@ -161,7 +161,7 @@ describe Furoshiki::Shoes::Configuration do
       it "finds the config" do
         Dir.chdir File.dirname(__FILE__) do
           config = Furoshiki::Shoes::Configuration.load(path)
-          config.shortname.should eq('sweet-nebulae')
+          expect(config.shortname).to eq('sweet-nebulae')
         end
       end
     end
@@ -191,7 +191,7 @@ describe Furoshiki::Shoes::Configuration do
 
     context "when the file doesn't exist" do
       it "blows up" do
-        lambda { Furoshiki::Shoes::Configuration.load('some/bogus/path') }.should raise_error
+        expect { Furoshiki::Shoes::Configuration.load('some/bogus/path') }.to raise_error
       end
     end
   end

data/spec/shoes/spec_helper.rb

@@ -5,6 +5,8 @@ SHOESSPEC_ROOT = File.expand_path('..', __FILE__)
 ENV['FUROSHIKI_HOME'] = SHOESSPEC_ROOT
 
 require 'rspec'
+require 'rspec/its'
+require 'pry'
 require 'pathname'
 require 'furoshiki/shoes'
 

data/spec/shoes/swt_app_spec.rb

@@ -38,7 +38,7 @@ describe Furoshiki::Shoes::SwtApp do
 
     it "sets package dir to {pwd}/pkg" do
       Dir.chdir @app_dir do
-        subject.default_package_dir.should eq(@app_dir.join 'pkg')
+        expect(subject.default_package_dir).to eq(@app_dir.join 'pkg')
       end
     end
 
@@ -63,35 +63,35 @@ describe Furoshiki::Shoes::SwtApp do
     its(:template_path) { should exist }
 
     it "creates a .app" do
-      @output_file.should exist
+      expect(@output_file).to exist
     end
 
     it "includes launcher" do
-      launcher.should exist
+      expect(launcher).to exist
     end
 
     # Windows can't test this
     platform_is_not :windows do
       it "makes launcher executable" do
-        launcher.should be_executable
+        expect(launcher).to be_executable
       end
     end
 
     it "deletes generic icon" do
-      icon.parent.join('GenericApp.icns').should_not exist
+      expect(icon.parent.join('GenericApp.icns')).not_to exist
     end
 
     it "injects icon" do
-      icon.should exist
+      expect(icon).to exist
     end
 
     it "injects jar" do
-      jar.should exist
+      expect(jar).to exist
     end
 
     it "removes any extraneous jars" do
       jar_dir_contents = @output_file.join("Contents/Java").children
-      jar_dir_contents.reject {|f| f == jar }.should be_empty
+      expect(jar_dir_contents.reject {|f| f == jar }).to be_empty
     end
 
     describe "Info.plist" do
@@ -101,23 +101,23 @@ describe Furoshiki::Shoes::SwtApp do
       end
 
       it "sets identifier" do
-        @plist['CFBundleIdentifier'].should eq('com.hackety.shoes.sweet-nebulae')
+        expect(@plist['CFBundleIdentifier']).to eq('com.hackety.shoes.sweet-nebulae')
       end
 
       it "sets display name" do
-        @plist['CFBundleDisplayName'].should eq('Sugar Clouds')
+        expect(@plist['CFBundleDisplayName']).to eq('Sugar Clouds')
       end
 
       it "sets bundle name" do
-        @plist['CFBundleName'].should eq('Sugar Clouds')
+        expect(@plist['CFBundleName']).to eq('Sugar Clouds')
       end
 
       it "sets icon" do
-        @plist['CFBundleIconFile'].should eq('boots.icns')
+        expect(@plist['CFBundleIconFile']).to eq('boots.icns')
       end
 
       it "sets version" do
-        @plist['CFBundleVersion'].should eq('0.0.1')
+        expect(@plist['CFBundleVersion']).to eq('0.0.1')
       end
     end
   end
@@ -127,7 +127,7 @@ describe Furoshiki::Shoes::SwtApp do
     subject { Furoshiki::Shoes::SwtApp.new config }
 
     it "fails to initialize" do
-      lambda { subject }.should raise_error(Furoshiki::ConfigurationError)
+      expect { subject }.to raise_error(Furoshiki::ConfigurationError)
     end
   end
 end

data/spec/shoes/swt_jar_spec.rb

@@ -25,20 +25,20 @@ describe Furoshiki::Shoes::SwtJar do
     subject { @subject }
 
     it "creates a .jar" do
-      output_file.should exist
+      expect(output_file).to exist
     end
 
     it "returns path to .jar" do
-      @jar_path.should eq(output_file.to_s)
+      expect(@jar_path).to eq(output_file.to_s)
     end
 
     it "creates .jar smaller than 50MB" do
-      File.size(output_file).should be < 50 * 1024 * 1024
+      expect(File.size(output_file)).to be < 50 * 1024 * 1024
     end
 
     it "excludes directories recursively" do
-      jar = Zip::ZipFile.new(output_file)
-      jar.entries.should_not include("dir_to_ignore/file_to_ignore")
+      jar = Zip::File.new(output_file)
+      expect(jar.entries).not_to include("dir_to_ignore/file_to_ignore")
     end
 
     its(:default_dir) { should eq(@output_dir) }
@@ -50,7 +50,7 @@ describe Furoshiki::Shoes::SwtJar do
     subject { Furoshiki::Shoes::SwtJar.new(config) }
 
     it "fails to initialize" do
-      lambda { subject }.should raise_error(Furoshiki::ConfigurationError)
+      expect { subject }.to raise_error(Furoshiki::ConfigurationError)
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+require 'rspec/its'
+
 module PackageHelpers
   # need these values from a context block, so let doesn't work
   def spec_dir

data/spec/support/shared_zip.rb

@@ -10,7 +10,7 @@ end
 shared_context 'zip' do
   include_context 'package'
   let(:output_file) { @output_dir.join 'zip_directory_spec.zip' }
-  let(:zip) { Zip::ZipFile.open output_file }
+  let(:zip) { Zip::File.open output_file }
 
   before :all do
     @output_dir.mkpath

data/spec/zip/directory_contents_spec.rb

@@ -10,20 +10,20 @@ describe Furoshiki::Zip::DirectoryContents do
     before :all do
       zip_directory_contents = Furoshiki::Zip::DirectoryContents.new input_dir, @output_file
       zip_directory_contents.write
-      @zip = Zip::ZipFile.open @output_file
+      @zip = Zip::File.open @output_file
     end
 
     it "exists" do
-      @output_file.should exist
+      expect(@output_file).to exist
     end
 
     it "does not include input directory without parents" do
-      @zip.entries.map(&:name).should_not include(add_trailing_slash input_dir.basename)
+      expect(@zip.entries.map(&:name)).not_to include(add_trailing_slash input_dir.basename)
     end
 
     relative_input_paths(input_dir).each do |path|
       it "includes all children of input directory" do
-        @zip.entries.map(&:name).should include(path)
+        expect(@zip.entries.map(&:name)).to include(path)
       end
     end
   end

data/spec/zip/directory_spec.rb

@@ -11,26 +11,26 @@ describe Furoshiki::Zip::Directory do
     before :all do
       zip_directory = Furoshiki::Zip::Directory.new input_dir, @output_file
       zip_directory.write
-      @zip = Zip::ZipFile.open @output_file
+      @zip = ::Zip::File.open @output_file
     end
 
     it "exists" do
-      @output_file.should exist
+      expect(@output_file).to exist
     end
 
     it "includes input directory without parents" do
-      @zip.entries.map(&:name).should include(add_trailing_slash input_dir.basename)
+      expect(@zip.entries.map(&:name)).to include(add_trailing_slash input_dir.basename)
     end
 
     relative_input_paths(input_dir.parent).each do |path|
       it "includes all children of input directory" do
-        @zip.entries.map(&:name).should include(path)
+        expect(@zip.entries.map(&:name)).to include(path)
       end
     end
 
     it "doesn't include extra files" do
       number_of_files = Dir.glob("#{input_dir}/**/*").push(input_dir).length
-      @zip.entries.length.should eq(number_of_files)
+      expect(@zip.entries.length).to eq(number_of_files)
     end
   end
 end

metadata

@@ -1,30 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: furoshiki
 version: !ruby/object:Gem::Version
-  prerelease:
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Steve Klabnik
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-09-27 00:00:00.000000000 Z
+date: 2014-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: warbler
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-    none: false
+        version: 1.4.4
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-    none: false
+        version: 1.4.4
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -34,29 +31,25 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: rubyzip
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
-    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
-    none: false
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -66,13 +59,11 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
@@ -82,13 +73,39 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: rspec-its
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: pry
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   prerelease: false
   type: :development
 description: Create .app, .exe, and $LINUX_PACKAGE versions of your application, with its own embedded Ruby.
@@ -142,6 +159,7 @@ files:
 - vendor/appbundler-1.0.jar
 homepage: http://github.com/steveklabnik/furoshiki
 licenses: []
+metadata: {}
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -151,23 +169,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2
-  none: false
 requirements: []
 rubyforge_project:
-rubygems_version: 1.8.24
+rubygems_version: 2.1.9
 signing_key:
-specification_version: 3
+specification_version: 4
 summary: Package and distribute applications with Ruby.
 test_files: []