wrapp 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff8d66befa9b271ee02eff82024ff41eeb886a4d
-  data.tar.gz: 03c0df25217a78d8d88410a516b2b567f33a445f
+  metadata.gz: aa02c58c3b3c18cebe04cf2f4bf1796ba9338dcd
+  data.tar.gz: 06250ab7bf416bd4c55e9ce4803d9f3daac6fd20
 SHA512:
-  metadata.gz: b0b10338cb16cfd88e73dbc87c7a1067855d95477c4cf5a2496f070c7d1f4bc812f0be9f9baaee58622746fae46e34e132c46bf497448a9ea533701670f1d43f
-  data.tar.gz: b5031ceb50be7fcc37cb3f49e75686c4bb07fb87b0c1b29b5068a44b55d69c28c61af5b051de4f74c1b9269b51ecab15f53f226c457ea3da97fbdff768af83c3
+  metadata.gz: 60c958a5e5664759b59c6e2f1922c9add044c4c3d3ebf17454d658e4991cf737a0034cb790cce2c346bafbf8ca87ef7b7aa516f13afbf4b11a59091ace0d9acb
+  data.tar.gz: 5bd40f4dc59808537801fdf04b4ba76382351cdd5da7a0ec2c3eb6fef037df405c284ce17683c920f4dab662e2648a9eec17129f90876920c89a09c6513bb1de

data/README.md

@@ -68,4 +68,4 @@ issues. Then:
 
 ## Copyright
 
-Copyright (c) 2013 Björn Albers
+Copyright (c) 2017 Björn Albers

data/features/step_definitions/wrapp_steps.rb

@@ -59,6 +59,11 @@ When(/^I wrap the App including the parent directory$/) do
   run_simple(unescape(cmd))
 end
 
+When(/^I wrap the App including \/Applications symlink$/) do
+  cmd = "wrapp --add-applications-link '#{@app.app_path}'"
+  run_simple(unescape(cmd))
+end
+
 Then(/^the App should be wrapped$/) do
   attach_dmg
   attached_app_path = File.join(volumes_dir, @app.app_name)
@@ -71,6 +76,12 @@ Then(/^the App should be wrapped including the parent directory$/) do
   check_directory_presence([attached_app_path], true)
 end
 
+Then(/^the app should be wrapped including the \/Applications symlink$/) do
+  attach_dmg
+  attached_app_path = File.join(volumes_dir, @app.app_name)
+  check_directory_presence([File.join(attached_app_path, 'Applications')], true)
+end
+
 Then(/^I should see usage instructions$/) do
   expected = "Usage: wrapp [options] APP_PATH"
   assert_partial_output(expected, all_output)

data/features/wrap_app.feature

@@ -15,6 +15,11 @@ Feature: Wrap App
     When I wrap the App including the parent directory
     Then the App should be wrapped including the parent directory
 
+  Scenario: Wrap App including the /Applications symlink
+    Given an App
+    When I wrap the App including /Applications symlink
+    Then the app should be wrapped including the /Applications symlink
+
   Scenario: Display usage
     When I run `wrapp`
     Then I should see usage instructions

data/lib/wrapp/cli.rb

@@ -9,6 +9,21 @@ module Wrapp
       :short => '-i',
       :description => "Include the App's parent directory in the DMG with all(!!!) content.",
       :boolean => true
+    option :add_applications_link,
+      :long => '--add-applications-link',
+      :short => '-l',
+      :description => 'Add /Applications symlink to the DMG.',
+      :boolean => true,
+      :default => true
+    option :filesystem,
+      :long => '--filesystem FILESYSTEM',
+      :short => '-f FILESYSTEM',
+      :description => "Causes a filesystem of the specified type to be written to the image.",
+      :default => 'HFS+'
+    option :volume_name,
+      :long => '--volume-name NAME',
+      :short => '-n NAME',
+      :description => "Volume name of the newly created filesystem."
 
     class << self
       def run

data/lib/wrapp/dmg_builder.rb

@@ -1,3 +1,5 @@
+require 'tmpdir'
+
 module Wrapp
   class DMGBuilder
     BIG_SOURCE_FOLDER_SIZE = 100
@@ -10,14 +12,22 @@ module Wrapp
     end
 
     def create
-      cmd = %w(hdiutil create)
-      cmd << "-srcfolder '#{source_path}'"
-      # NOTE: There is a known bug in hdiutil that causes the image creation
-      # to fail, see: https://discussions.apple.com/thread/5667409
-      # Therefore we have to explicitely set the dmg size for bigger sources.
-      cmd << "-megabytes #{dmg_size}" if big_source_folder?
-      cmd << "'#{dmg_filename}'"
-      system(cmd.join(' '))
+      Dir.mktmpdir('wrapp_dmg') { |dir|
+        FileUtils.cp_r(source_path, dir)
+
+        if @opts[:add_applications_link]
+          File.symlink('/Applications', File.join(dir, 'Applications'))
+        end
+
+        cmd = %w(hdiutil create)
+        cmd << "-srcfolder '#{dir}'"
+        # NOTE: There is a known bug in hdiutil that causes the image creation
+        # to fail, see: https://discussions.apple.com/thread/5667409
+        # Therefore we have to explicitely set the dmg size for bigger sources.
+        cmd << "-megabytes #{dmg_size}" if big_source_folder?
+        cmd << "'#{dmg_filename}'"
+        system(cmd.join(' '))
+      }
     end
 
     private
@@ -45,6 +55,10 @@ module Wrapp
       "#{app.full_name}.dmg"
     end
 
+    def vol_name
+      @opts[:volume_name] ? @opts[:volume_name] : app.name
+    end
+
     def app
       @app_info ||= AppInfo.new(plist)
     end

data/lib/wrapp/version.rb

@@ -1,3 +1,3 @@
 module Wrapp
-  VERSION = '0.6.0'
+  VERSION = '0.7.0'
 end

data/spec/wrapp/cli_spec.rb

@@ -62,6 +62,30 @@ module Wrapp
           end
         end
       end
+
+      %w(--filesystem -fs).each do |opt|
+        context "with #{opt}" do
+          let(:argv) { [app_path, opt] }
+
+          it 'specifies the filesystem type' do
+            cli.should_receive(:wrapp)
+              .with(app_path, :filesystem => 'HFS+')
+            cli.run(argv)
+          end
+        end
+      end
+
+      %w(--volume-name -n).each do |opt|
+        context "with #{opt}" do
+          let(:argv) { [app_path, opt] }
+
+          if 'specifies the volume name' do
+            cli.should_receive(:wrapp)
+              .with(app_path, :volume_name => '')
+            cli.run(argv)
+          end
+        end
+      end
     end
 
     describe '#wrapp' do

data/spec/wrapp/dmg_builder_spec.rb

@@ -100,6 +100,14 @@ module Wrapp
       end
     end
 
+    describe '#vol_name' do
+      if 'returns the volume name' do
+          app.should_receive(:name).and_return('chunky_bacon')
+          dmg.stub(:app).and_return(app)
+          expect(dmg.send(:vol_name)).to eq('chunky_bacon')
+      end
+    end
+
     describe '#app' do
       it 'creates a cached app_info instance' do
         dmg.should_receive(:plist).and_return('Info.plist')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wrapp
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Björn Albers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-06 00:00:00.000000000 Z
+date: 2017-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
@@ -157,10 +157,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
-summary: wrapp-0.6.0
+summary: wrapp-0.7.0
 test_files:
 - features/step_definitions/wrapp_steps.rb
 - features/support/app.rb