furoshiki 0.2.0 → 0.3.0

data/spec/{shoes/swt_app_spec.rb → app_spec.rb}

@@ -1,20 +1,19 @@
 require 'spec_helper'
-require_relative 'spec_helper'
 require 'pathname'
-require 'furoshiki/shoes/swt_app'
+require 'furoshiki/jar_app'
 
 include PackageHelpers
 
-describe Furoshiki::Shoes::SwtApp do
-  include_context 'config'
-  include_context 'package'
+describe Furoshiki::JarApp do
+  include_context 'generic furoshiki config'
+  include_context 'generic furoshiki project'
 
-  let(:config) {Furoshiki::Shoes::Configuration.load @config_filename }
-  subject {Furoshiki::Shoes::SwtApp.new config}
+  let(:config) {Furoshiki::Configuration.new @custom_config }
+  subject {Furoshiki::JarApp.new config}
 
   let(:launcher) { @output_file.join('Contents/MacOS/JavaAppLauncher') }
-  let(:icon)  { @output_file.join('Contents/Resources/boots.icns') }
-  let(:jar) { @output_file.join('Contents/Java/sweet-nebulae.jar') }
+  let(:icon)  { @output_file.join('Contents/Resources/Shoes.icns') }
+  let(:jar) { @output_file.join('Contents/Java/rubyapp.jar') }
 
   # $FUROSHIKI_HOME is set in spec_helper.rb for testing purposes,
   # but should default to $HOME
@@ -33,7 +32,7 @@ describe Furoshiki::Shoes::SwtApp do
   end
 
   context "default" do
-    let(:cache_dir) { Pathname.new(SHOESSPEC_ROOT).join('.furoshiki', 'cache') }
+    let(:cache_dir) { Pathname.new(FUROSHIKI_SPEC_DIR).join('.furoshiki', 'cache') }
     its(:cache_dir) { should eq(cache_dir) }
 
     it "sets package dir to {pwd}/pkg" do
@@ -43,21 +42,25 @@ describe Furoshiki::Shoes::SwtApp do
     end
 
     its(:template_path) { should eq(cache_dir.join('shoes-app-template.zip')) }
-    its(:remote_template_url) { should eq(Furoshiki::Shoes::SwtApp::REMOTE_TEMPLATE_URL) }
+    its(:remote_template_url) { should eq(Furoshiki::Configuration::JAR_APP_TEMPLATE_URL) }
   end
 
   context "when creating a .app" do
     before :all do
-      @output_dir.rmtree if @output_dir.exist?
+      #@output_dir.rmtree if @output_dir.exist?
       @output_dir.mkpath
-      app_name = 'Sugar Clouds.app'
+
+      app_name = 'Ruby App.app'
       @output_file = @output_dir.join app_name
-      config   = Furoshiki::Shoes::Configuration.load @config_filename
-      @subject = Furoshiki::Shoes::SwtApp.new config
+
+      # Config picks up Dir.pwd
       Dir.chdir @app_dir do
+        config = Furoshiki::Configuration.new(@custom_config)
+        @subject = Furoshiki::JarApp.new(config)
         @subject.package
       end
     end
+
     subject { @subject }
 
     its(:template_path) { should exist }
@@ -101,30 +104,34 @@ describe Furoshiki::Shoes::SwtApp do
       end
 
       it "sets identifier" do
-        expect(@plist['CFBundleIdentifier']).to eq('com.hackety.shoes.sweet-nebulae')
+        expect(@plist['CFBundleIdentifier']).to eq('com.hackety.shoes.rubyapp')
       end
 
       it "sets display name" do
-        expect(@plist['CFBundleDisplayName']).to eq('Sugar Clouds')
+        expect(@plist['CFBundleDisplayName']).to eq('Ruby App')
       end
 
       it "sets bundle name" do
-        expect(@plist['CFBundleName']).to eq('Sugar Clouds')
+        expect(@plist['CFBundleName']).to eq('Ruby App')
       end
 
       it "sets icon" do
-        expect(@plist['CFBundleIconFile']).to eq('boots.icns')
+        expect(@plist['CFBundleIconFile']).to eq('Shoes.icns')
       end
 
       it "sets version" do
-        expect(@plist['CFBundleVersion']).to eq('0.0.1')
+        expect(@plist['CFBundleVersion']).to eq('0.0.0')
       end
     end
   end
 
   describe "with an invalid configuration" do
-    let(:config) { Furoshiki::Shoes::Configuration.new }
-    subject { Furoshiki::Shoes::SwtApp.new config }
+    let(:config) { Furoshiki::Configuration.new }
+    subject { Furoshiki::JarApp.new config }
+
+    before do
+      allow(config).to receive(:valid?) { false }
+    end
 
     it "fails to initialize" do
       expect { subject }.to raise_error(Furoshiki::ConfigurationError)

data/spec/configuration_spec.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+require 'furoshiki/configuration'
+
+describe Furoshiki::Configuration do
+  context "defaults" do
+    let(:config) { Furoshiki::Configuration.new }
+
+    it "is valid" do
+      expect(config).to be_valid
+    end
+  end
+end

data/spec/fixtures/config.yaml

@@ -0,0 +1 @@
+gems: 'rubyzip'

data/spec/fixtures/test_project/bin/hello.rb

@@ -0,0 +1 @@
+puts "Hello, world!"

data/spec/fixtures/test_project/dir_to_ignore/file_to_ignore.txt

@@ -0,0 +1 @@
+should be ignored

data/spec/{shoes/swt_jar_spec.rb → jar_spec.rb}

@@ -1,26 +1,28 @@
 require 'spec_helper'
 require_relative 'spec_helper'
 require 'pathname'
-require 'furoshiki/shoes/swt_jar'
+require 'furoshiki/jar'
 
 include PackageHelpers
 
-describe Furoshiki::Shoes::SwtJar do
-  include_context 'config'
-  include_context 'package'
+describe Furoshiki::Jar do
+  include_context 'generic furoshiki config'
+  include_context 'generic furoshiki project'
 
   context "when creating a .jar" do
     before :all do
       @output_dir.rmtree if @output_dir.exist?
       @output_dir.mkpath
-      config = Furoshiki::Shoes::Configuration.load(@config_filename)
-      @subject = Furoshiki::Shoes::SwtJar.new(config)
+
+      # Config picks up Dir.pwd
       Dir.chdir @app_dir do
+        config = Furoshiki::Configuration.new(@custom_config)
+        @subject = Furoshiki::Jar.new(config)
         @jar_path = @subject.package(@output_dir)
       end
     end
 
-    let(:jar_name) { 'sweet-nebulae.jar' }
+    let(:jar_name) { 'rubyapp.jar' }
     let(:output_file) { Pathname.new(@output_dir.join jar_name) }
     subject { @subject }
 
@@ -36,9 +38,16 @@ describe Furoshiki::Shoes::SwtJar do
       expect(File.size(output_file)).to be < 50 * 1024 * 1024
     end
 
-    it "excludes directories recursively" do
-      jar = Zip::File.new(output_file)
-      expect(jar.entries).not_to include("dir_to_ignore/file_to_ignore")
+    context "inspecting contents" do
+      let (:jar) { Zip::File.new(output_file) }
+
+      it "includes a specified gem" do
+        expect(jar.glob "gems/rubyzip*").to_not be_empty
+      end
+
+      it "does not include a non-specified gem" do
+        expect(jar.glob "gems/warbler*").to be_empty
+      end
     end
 
     its(:default_dir) { should eq(@output_dir) }
@@ -46,8 +55,12 @@ describe Furoshiki::Shoes::SwtJar do
   end
 
   describe "with an invalid configuration" do
-    let(:config) { Furoshiki::Shoes::Configuration.new }
-    subject { Furoshiki::Shoes::SwtJar.new(config) }
+    let(:config) { Furoshiki::Configuration.new }
+    subject { Furoshiki::Jar.new(config) }
+
+    before do
+      allow(config).to receive(:valid?) { false }
+    end
 
     it "fails to initialize" do
       expect { subject }.to raise_error(Furoshiki::ConfigurationError)

data/spec/spec_helper.rb

@@ -1,4 +1,55 @@
+require 'rspec'
 require 'rspec/its'
+require 'pry'
+require 'pathname'
+
+# Packaging caches files in $HOME/.furoshiki/cache by default.
+# For testing, we override $HOME using $FUROSHIKI_HOME
+FUROSHIKI_SPEC_DIR = Pathname.new(__FILE__).dirname.expand_path.to_s
+ENV['FUROSHIKI_HOME'] = FUROSHIKI_SPEC_DIR
+
+# Guards for running or not running specs. Specs in the guarded block only
+# run if the guard conditions are met.
+#
+module Guard
+  # Runs specs only if platform matches
+  #
+  # @example
+  # platform_is :windows do
+  #   it "does something only on windows" do
+  #     # specification
+  #   end
+  # end
+  def platform_is(platform)
+    yield if self.send "platform_is_#{platform.to_s}"
+  end
+
+  # Runs specs only if platform does not match
+  #
+  # @example
+  # platform_is_not :windows do
+  #   it "does something only on posix systems" do
+  #     # specification
+  #   end
+  # end
+  def platform_is_not(platform)
+    yield unless self.send "platform_is_#{platform.to_s}"
+  end
+
+  def platform_is_windows
+    return RbConfig::CONFIG['host_os'] =~ /windows|mswin/i
+  end
+
+  def platform_is_linux
+    return RbConfig::CONFIG['host_os'] =~ /linux/i
+  end
+
+  def platform_is_osx
+    return RbConfig::CONFIG['host_os'] =~ /darwin/i
+  end
+end
+
+include Guard
 
 module PackageHelpers
   # need these values from a context block, so let doesn't work

data/spec/support/shared_config.rb

@@ -0,0 +1,19 @@
+require 'yaml'
+require 'pathname'
+require 'furoshiki/util'
+
+shared_context 'generic furoshiki config' do
+  before :all do
+    @config_filename = Pathname.new(__FILE__).join('../../fixtures/config.yaml').cleanpath
+    yaml = YAML.load(@config_filename.open)
+    @custom_config = Object.new.extend(Furoshiki::Util).deep_symbolize_keys(yaml)
+  end
+end
+
+shared_context 'generic furoshiki project' do
+  before :all do
+    @app_dir = Pathname.new(__FILE__).join('../../fixtures/test_project')
+    @output_dir = @app_dir.join('pkg')
+  end
+end
+

data/spec/support/shared_zip.rb

@@ -2,7 +2,7 @@ include ZipHelpers
 
 shared_context 'package' do
   before :all do
-    @app_dir = spec_dir.join 'shoes/test_app'
+    @app_dir = spec_dir.join 'fixtures/test_app'
     @output_dir = @app_dir.join 'pkg'
   end
 end

data/spec/util_spec.rb

@@ -0,0 +1,57 @@
+require_relative 'spec_helper'
+
+describe "Utility functions" do
+  let(:utils) { Object.new.extend(Furoshiki::Util) }
+  let(:hash_with_string_keys) {
+    {
+      'one' => 1,
+      :two => 2,
+      'three' => {
+        'a' => 'apple',
+        :b => 'banana',
+        'c' => :cantaloupe
+      }
+    }
+  }
+  let(:hash_with_symbolized_keys) {
+    {
+      :one => 1,
+      :two => 2,
+      :three => {
+        :a => 'apple',
+        :b => 'banana',
+        :c => :cantaloupe
+      }
+    }
+  }
+  let(:hash_of_defaults) {
+    {
+      :one => 'uno',
+      :three => 'tres',
+      :four => 'cuatro'
+    }
+  }
+  let(:merged_hash_with_symbolized_keys) {
+    {
+      :one => 1,
+      :two => 2,
+      :three => {
+        :a => 'apple',
+        :b => 'banana',
+        :c => :cantaloupe
+      },
+      :four => 'cuatro'
+    }
+  }
+
+  it "symbolizes hash keys" do
+    symbolized = utils.deep_symbolize_keys(hash_with_string_keys)
+    expect(symbolized).to eq(hash_with_symbolized_keys)
+  end
+
+  it "merges with hash of defaults" do 
+    merged = utils.merge_with_symbolized_keys(hash_of_defaults, hash_with_string_keys)
+    expect(merged).to eq(merged_hash_with_symbolized_keys)
+  end
+
+end

metadata

@@ -1,113 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: furoshiki
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Steve Klabnik
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-09-28 00:00:00.000000000 Z
+date: 2015-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: warbler
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.4.4
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.4.4
+  name: warbler
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: plist
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.4
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: plist
   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
+        version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
+  name: rubyzip
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: rake
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rspec
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
+  name: rspec
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rspec-its
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: rspec-its
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: pry
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: pry
   prerelease: false
   type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Create .app, .exe, and $LINUX_PACKAGE versions of your application, with its own embedded Ruby.
 email: steve@steveklabnik.com
 executables: []
@@ -126,34 +126,39 @@ files:
 - example/Rakefile
 - furoshiki.gemspec
 - lib/furoshiki.rb
+- lib/furoshiki/configuration.rb
 - lib/furoshiki/exceptions.rb
-- lib/furoshiki/shoes.rb
-- lib/furoshiki/shoes/configuration.rb
-- lib/furoshiki/shoes/swt_app.rb
-- lib/furoshiki/shoes/swt_jar.rb
+- lib/furoshiki/jar.rb
+- lib/furoshiki/jar_app.rb
+- lib/furoshiki/util.rb
+- lib/furoshiki/validator.rb
 - lib/furoshiki/version.rb
+- lib/furoshiki/warbler_extensions.rb
 - lib/furoshiki/zip.rb
 - lib/furoshiki/zip/directory.rb
 - lib/furoshiki/zip/directory_contents.rb
 - lib/furoshiki/zip/recursive.rb
-- lib/warbler/traits/shoes.rb
-- spec/shoes/configuration_spec.rb
-- spec/shoes/spec_helper.rb
-- spec/shoes/support/shared_config.rb
-- spec/shoes/swt_app_spec.rb
-- spec/shoes/swt_jar_spec.rb
-- spec/shoes/test_app/app.yaml
-- spec/shoes/test_app/bin/hello_world
-- spec/shoes/test_app/dir_to_ignore/file_to_ignore.txt
-- spec/shoes/test_app/img/boots.icns
-- spec/shoes/test_app/img/boots.ico
-- spec/shoes/test_app/img/boots_512x512x32.png
-- spec/shoes/test_app/sibling.rb
+- lib/warbler/traits/furoshiki.rb
+- spec/app_spec.rb
+- spec/configuration_spec.rb
+- spec/fixtures/config.yaml
+- spec/fixtures/test_app/app.yaml
+- spec/fixtures/test_app/bin/hello_world
+- spec/fixtures/test_app/dir_to_ignore/file_to_ignore.txt
+- spec/fixtures/test_app/img/boots.icns
+- spec/fixtures/test_app/img/boots.ico
+- spec/fixtures/test_app/img/boots_512x512x32.png
+- spec/fixtures/test_app/sibling.rb
+- spec/fixtures/test_project/bin/hello.rb
+- spec/fixtures/test_project/dir_to_ignore/file_to_ignore.txt
+- spec/jar_spec.rb
 - spec/spec_helper.rb
+- spec/support/shared_config.rb
 - spec/support/shared_zip.rb
 - spec/support/zip/a/a.rb
 - spec/support/zip/a/b/b.png
 - spec/support/zip/a/b/c/c.rb
+- spec/util_spec.rb
 - spec/zip/directory_contents_spec.rb
 - spec/zip/directory_spec.rb
 - vendor/appbundler-1.0.jar
@@ -176,8 +181,31 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.1.9
+rubygems_version: 2.4.2
 signing_key:
 specification_version: 4
 summary: Package and distribute applications with Ruby.
-test_files: []
+test_files:
+- spec/app_spec.rb
+- spec/configuration_spec.rb
+- spec/fixtures/config.yaml
+- spec/fixtures/test_app/app.yaml
+- spec/fixtures/test_app/bin/hello_world
+- spec/fixtures/test_app/dir_to_ignore/file_to_ignore.txt
+- spec/fixtures/test_app/img/boots.icns
+- spec/fixtures/test_app/img/boots.ico
+- spec/fixtures/test_app/img/boots_512x512x32.png
+- spec/fixtures/test_app/sibling.rb
+- spec/fixtures/test_project/bin/hello.rb
+- spec/fixtures/test_project/dir_to_ignore/file_to_ignore.txt
+- spec/jar_spec.rb
+- spec/spec_helper.rb
+- spec/support/shared_config.rb
+- spec/support/shared_zip.rb
+- spec/support/zip/a/a.rb
+- spec/support/zip/a/b/b.png
+- spec/support/zip/a/b/c/c.rb
+- spec/util_spec.rb
+- spec/zip/directory_contents_spec.rb
+- spec/zip/directory_spec.rb
+has_rdoc: