shoes-package 4.0.0.pre6 → 4.0.0.pre7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d890e900690901df7d3753caab977a81fb70f442
-  data.tar.gz: f127b6dec80139aab82e450585ef446f1ea65244
+  metadata.gz: ae062974967b441f26f83ce016b4c1ef030371aa
+  data.tar.gz: a574f7c9022023305a83d4e64ec7640fab433ae3
 SHA512:
-  metadata.gz: 8af432e712088778dbc16889347e36a8f5fc909229d322a7dbacdc6968fe11a377159502366319d975788256a3cabb9877ceeabff4e29563f6ed75574c611024
-  data.tar.gz: 134ab338ca26c66d523d290a14ec61bdd448b29afefc8e5acbdfce9cb077be8075ca6158b17a231d254c080411dbe4f868f3f3101cf65f97e98a0988801b5cd4
+  metadata.gz: 77e56c8ad760ed134b318c39168dcb0394a928f2fd2b34f962ce8ad2f9dec078ec43aeeb71f4878872561a427dddfeb520cf5310e06b024dfcd997ae375c7dad
+  data.tar.gz: 322afeacda5569a04d24dc65dca71156846ed26108dd9f1a8e244bb7c27be3bbd223b896e89d791ba85aedfa3c4de0228d646b8e86ee303e9fb476fae4e682dc

data/Guardfile

@@ -1,4 +1,4 @@
 guard 'rspec', cmd: 'rspec' do
   watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
+  watch(%r{^lib/(.+)\.rb$}) { |m| "spec/#{m[1]}_spec.rb" }
 end

data/lib/shoes/package/configuration.rb

@@ -16,17 +16,18 @@ class Shoes
     module Configuration
       extend ::Furoshiki::Util
 
-      JAR_APP_TEMPLATE_URL = 'https://s3.amazonaws.com/net.wasnotrice.shoes/wrappers/shoes-app-template-0.0.2.zip'
+      JAR_APP_TEMPLATE_URL = 'https://s3.amazonaws.com/net.wasnotrice.shoes/wrappers/shoes-app-template-0.0.2.zip'.freeze
 
       # Convenience method for loading config from a file. Note that you
       # can pass four kinds of paths to the loader. Given the following
       # file structure:
       #
-      #   ├── a
-      #   │   ├── app.yaml
-      #   │   └── shoes-app-a.rb
-      #   └── b
-      #   └── shoes-app-b.rb
+      # |-- a
+      # |   |-- app.yaml
+      # |   |-- shoes-app-a.rb
+      # |
+      # |-- b
+      # |-- shoes-app-b.rb
       #
       # To package an app that has an `app.yaml`, like `shoes-app-a.rb`,
       # you can call the loader with any of:
@@ -57,11 +58,14 @@ class Shoes
         app_yaml = Pathname.new('app.yaml')
 
         if pathname.basename == app_yaml
-          file, dir = pathname, pathname.dirname
+          file = pathname
+          dir = pathname.dirname
         elsif pathname.directory?
-          file, dir = pathname.join(app_yaml), pathname
-        elsif pathname.file? && pathname.parent.children.include?(pathname.parent.join app_yaml)
-          file, dir = pathname.parent.join(app_yaml), pathname.parent
+          file = pathname.join(app_yaml)
+          dir = pathname
+        elsif pathname.file? && pathname.parent.children.include?(pathname.parent.join(app_yaml))
+          file = pathname.parent.join(app_yaml)
+          dir = pathname.parent
         else
           file, dir = config_for_single_file_app(pathname)
         end
@@ -82,14 +86,14 @@ class Shoes
           ignore: 'pkg',
           # TODO: Add actual paths. Keep these keys for compatibility with Shoes 3
           icons: {
-            #osx: 'path/to/default/App.icns',
-            #gtk: 'path/to/default/app.png',
-            #win32: 'path/to/default/App.ico',
+            # osx: 'path/to/default/App.icns',
+            # gtk: 'path/to/default/app.png',
+            # win32: 'path/to/default/App.ico',
           },
           # TODO: Add actual paths. Keep these keys for compatibility with Shoes 3
           dmg: {
-            #ds_store: 'path/to/default/.DS_Store',
-            #background: 'path/to/default/background.png'
+            # ds_store: 'path/to/default/.DS_Store',
+            # background: 'path/to/default/background.png'
           },
           working_dir: Dir.pwd,
           gems: ['shoes-core'],
@@ -102,8 +106,6 @@ class Shoes
         Furoshiki::Configuration.new defaults.merge(symbolized_config)
       end
 
-      private
-
       # If it exists, load default options. If not, let the filesystem raise an
       # error.
       def self.config_for_single_file_app(pathname)
@@ -120,8 +122,16 @@ class Shoes
       # replace the whole array, so we handle the gems separately. Note that
       # keys may not have been symbolized yet
       def self.merge_gems(base, additional)
-        base_gems = base.fetch(:gems) rescue base['gems']
-        additional_gems = additional.fetch(:gems) rescue additional['gems']
+        base_gems = begin
+                      base.fetch(:gems)
+                    rescue
+                      base['gems']
+                    end
+        additional_gems = begin
+                            additional.fetch(:gems)
+                          rescue
+                            additional['gems']
+                          end
         Array(base_gems).concat(Array(additional_gems)).uniq
       end
     end

data/lib/shoes/package/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 class Shoes
   module Package
-    VERSION = "4.0.0.pre6"
+    VERSION = "4.0.0.pre7"
   end
 end

data/lib/warbler/traits/shoes.rb

@@ -11,7 +11,9 @@ module Warbler
 
     # Disable this trait, since we are subclassing it (don't run twice)
     class Furoshiki
-      def self.detect?; false; end
+      def self.detect?
+        false
+      end
     end
 
     class Shoes < Furoshiki

data/spec/configuration_spec.rb

@@ -131,7 +131,7 @@ describe Shoes::Package::Configuration do
   end
 
   context "when osx icon is specified, but doesn't exist" do
-    let(:options) { ({icons: {osx: "path/to/non-existent/file"}}) }
+    let(:options) { {icons: {osx: "path/to/non-existent/file"}} }
     subject { Shoes::Package::Configuration.create options }
 
     it "sets osx icon path" do
@@ -180,7 +180,7 @@ describe Shoes::Package::Configuration do
       it "blows up" do
         expect do
           Shoes::Package::Configuration.load('some/bogus/path')
-        end.to raise_error /No such file or directory/
+        end.to raise_error(/No such file or directory/)
       end
     end
 

data/spec/spec_helper.rb

@@ -3,7 +3,7 @@
 FUROSHIKI_SPEC_DIR = Pathname.new(__FILE__).dirname.expand_path.to_s
 ENV['FUROSHIKI_HOME'] = FUROSHIKI_SPEC_DIR
 
-SHOES_PACKAGE_SPEC_ROOT= File.expand_path('..', __FILE__)
+SHOES_PACKAGE_SPEC_ROOT = File.expand_path('..', __FILE__)
 
 $LOAD_PATH << File.expand_path(SHOES_PACKAGE_SPEC_ROOT)
 $LOAD_PATH << File.expand_path('../../lib', __FILE__)
@@ -12,7 +12,7 @@ $LOAD_PATH << File.expand_path('../../../shoes-core/lib', __FILE__)
 require 'pathname'
 require 'rspec/its'
 
-Dir["#{SHOES_PACKAGE_SPEC_ROOT}/support/**/*.rb"].each {|f| require f}
+Dir["#{SHOES_PACKAGE_SPEC_ROOT}/support/**/*.rb"].each { |f| require f }
 
 module PackageHelpers
   # need these values from a context block, so let doesn't work
@@ -38,7 +38,7 @@ module Guard
   #   end
   # end
   def platform_is(platform)
-    yield if self.send "platform_is_#{platform}"
+    yield if send "platform_is_#{platform}"
   end
 
   # Runs specs only if platform does not match
@@ -50,19 +50,19 @@ module Guard
   #   end
   # end
   def platform_is_not(platform)
-    yield unless self.send "platform_is_#{platform}"
+    yield unless send "platform_is_#{platform}"
   end
 
   def platform_is_windows
-    return RbConfig::CONFIG['host_os'] =~ /windows|mswin/i
+    RbConfig::CONFIG['host_os'] =~ /windows|mswin/i
   end
 
   def platform_is_linux
-    return RbConfig::CONFIG['host_os'] =~ /linux/i
+    RbConfig::CONFIG['host_os'] =~ /linux/i
   end
 
   def platform_is_osx
-    return RbConfig::CONFIG['host_os'] =~ /darwin/i
+    RbConfig::CONFIG['host_os'] =~ /darwin/i
   end
 end
 

data/spec/swt_app_spec.rb

@@ -36,7 +36,7 @@ describe Shoes::Package::JarApp do
 
     it "sets package dir to {pwd}/pkg" do
       Dir.chdir @app_dir do
-        expect(subject.default_package_dir).to eq(@app_dir.join 'pkg')
+        expect(subject.default_package_dir).to eq(@app_dir.join('pkg'))
       end
     end
 
@@ -88,13 +88,13 @@ describe Shoes::Package::JarApp do
 
     it "removes any extraneous jars" do
       jar_dir_contents = @output_file.join("Contents/Java").children
-      expect(jar_dir_contents.reject {|f| f == jar }).to be_empty
+      expect(jar_dir_contents.reject { |f| f == jar }).to be_empty
     end
 
     describe "Info.plist" do
       require 'plist'
       before :all do
-        @plist = Plist.parse_xml(@output_file.join 'Contents/Info.plist')
+        @plist = Plist.parse_xml(@output_file.join('Contents/Info.plist'))
       end
 
       it "sets identifier" do

data/spec/swt_jar_spec.rb

@@ -18,7 +18,7 @@ describe Furoshiki::Jar do
     end
 
     let(:jar_name) { 'sweet-nebulae.jar' }
-    let(:output_file) { Pathname.new(@output_dir.join jar_name) }
+    let(:output_file) { Pathname.new(@output_dir.join(jar_name)) }
     subject { @subject }
 
     it "creates a .jar" do
@@ -56,7 +56,7 @@ describe Furoshiki::Jar do
   end
 
   describe "with an invalid configuration" do
-    let(:config) { Shoes::Package::Configuration.create}
+    let(:config) { Shoes::Package::Configuration.create }
     subject { Shoes::Package::Jar.new(config) }
 
     it "fails to initialize" do

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: shoes-package
 version: !ruby/object:Gem::Version
-  version: 4.0.0.pre6
+  version: 4.0.0.pre7
 platform: ruby
 authors:
 - Team Shoes
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-11-07 00:00:00.000000000 Z
+date: 2016-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0.pre6
+        version: 4.0.0.pre7
   name: shoes-core
   prerelease: false
   type: :runtime
@@ -23,7 +23,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0.pre6
+        version: 4.0.0.pre7
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -85,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project:
-rubygems_version: 2.6.6
+rubygems_version: 2.6.8
 signing_key:
 specification_version: 4
 summary: Application packaging for Shoes, the best little GUI toolkit for Ruby.