furoshiki 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28682823686b0e99c68d8e89e8dda278cedcbd7f
-  data.tar.gz: 35eaf912683fd1e7f183d21cf55f998652f04348
+  metadata.gz: b06f70e3280753e54b88135f40c8e83a42f95d9d
+  data.tar.gz: 110d5572d7a5a4a18cce5a07ee194e4a36781ac3
 SHA512:
-  metadata.gz: 98811a3dfc69cda04149f26361b3b31d7b8525bb79b7151db8bba034c88e4468e93ebff266f9472026741c27b2ca53b72179c015822bee0c16461b5060aa4cc0
-  data.tar.gz: dec72fe9319649dfb226b22946b3bb2678443b0e83a8f39411e02b346d4d805c639d22d69b9fc678eb7aa931d78b89606deb906c12f6058e9f759e550ce88c00
+  metadata.gz: 004ef5299847879a64e4e21427adc2ee2cd61af23e8889ecd778a849f24a0e88399e0f2516698397f35a72a2866d79e879ea9f68041c46f838e3414c1a62aeaa
+  data.tar.gz: 2653762668554500ad8330d0f4e7865b53cf79230d758ddc94f8659714ca63e4b572b9af42935e38f7747a36e95e15f567a151619e6ae5e8d291a27b2a4a6985

data/lib/furoshiki/configuration.rb

@@ -15,7 +15,7 @@ module Furoshiki
   # after initialization, dump it with #to_hash, make your changes,
   # and instantiate a new object.
   class Configuration
-    JAR_APP_TEMPLATE_URL = 'https://s3.amazonaws.com/net.wasnotrice.shoes/wrappers/shoes-app-template-0.0.1.zip'
+    JAR_APP_TEMPLATE_URL = 'https://s3.amazonaws.com/net.wasnotrice.shoes/wrappers/shoes-app-template-0.0.2.zip'
 
     include Util
 
@@ -79,10 +79,12 @@ module Furoshiki
             children = Dir.glob("#{path}/**/*") if File.directory?(path)
             [path, *children]
           end.flatten
-          config.excludes.add FileList.new(ignore.flatten).pathmap(config.pathmaps.application.first)
           config.gem_excludes += [/^samples/, /^examples/, /^test/, /^spec/]
 
           warbler_extensions.customize(config) if warbler_extensions.respond_to? :customize
+
+          # Important this is after extensions can alter pathmaps.application
+          config.excludes.add FileList.new(ignore.flatten).pathmap(config.pathmaps.application.first)
         end
       end
       warbler_config

data/lib/furoshiki/jar_app.rb

@@ -86,11 +86,11 @@ module Furoshiki
     end
 
     def template_filename
-      "#{template_basename}#{template_extension}"
+      "#{template_basename}-#{latest_template_version}#{template_extension}"
     end
 
     def latest_template_version
-      '0.0.1'
+      '0.0.2'
     end
 
     def download_template
@@ -158,7 +158,7 @@ module Furoshiki
     # @param [Pathname, String] jar_path the location of the JAR to inject
     def inject_jar(jar_path)
       jar_dir = tmp_app_path.join('Contents/Java')
-      jar_dir.rmtree
+      jar_dir.rmtree if File.exist?(jar_dir)
       jar_dir.mkdir
       cp Pathname.new(jar_path), jar_dir
     end

data/lib/furoshiki/version.rb

@@ -1,4 +1,4 @@
 module Furoshiki
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end
 

data/spec/app_spec.rb

@@ -41,7 +41,9 @@ describe Furoshiki::JarApp do
       end
     end
 
-    its(:template_path) { should eq(cache_dir.join('shoes-app-template.zip')) }
+    it "caches current version of template" do
+      expect(subject.template_path).to eq(cache_dir.join('shoes-app-template-0.0.2.zip'))
+    end
     its(:remote_template_url) { should eq(Furoshiki::Configuration::JAR_APP_TEMPLATE_URL) }
   end
 

data/spec/configuration_spec.rb

@@ -2,11 +2,27 @@ require 'spec_helper'
 require 'furoshiki/configuration'
 
 describe Furoshiki::Configuration do
-  context "defaults" do
-    let(:config) { Furoshiki::Configuration.new }
+  subject(:config) { Furoshiki::Configuration.new(raw_config) }
 
-    it "is valid" do
-      expect(config).to be_valid
+  let(:raw_config) { { warbler_extensions: OtherCustomization,
+                       ignore: "pkg" } }
+
+  class OtherCustomization < Furoshiki::WarblerExtensions
+    def customize(config)
+      # Actual behavior with shoes-package overrides the application name, so
+      # for testing purposes reset it here too.
+      config.pathmaps.application = ["shoes-app/%p"]
     end
   end
+
+  it "is valid by default" do
+    expect(config).to be_valid
+  end
+
+  it "uses correct application path for exclusions" do
+    raw_config[:warbler_extensions] = OtherCustomization
+    raw_config[:ignore] = "pkg"
+
+    expect(config.to_warbler_config.excludes).to include("shoes-app/pkg")
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: furoshiki
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Steve Klabnik
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-01-06 00:00:00.000000000 Z
+date: 2015-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement