wrapp 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25cf9c09bb6bbae211ecb408887c7f2f3882fc39
-  data.tar.gz: a9e3f7c9e819f9b365066910cd6c66c90c2ff558
+  metadata.gz: ff8d66befa9b271ee02eff82024ff41eeb886a4d
+  data.tar.gz: 03c0df25217a78d8d88410a516b2b567f33a445f
 SHA512:
-  metadata.gz: 831b4c45087952ca1189ed35562c308d2e71f42c8a99ccd0f19c0def101133821f85db039fd9a1875f04b2a33ef091009d8ce30a24c2dd0fe97c6baca2307003
-  data.tar.gz: 6a72b9cb7672b4954cc54f124832d67219eddfd7eb686834ef7b38a5bae9fdb02b43308614d43e47322fc6654925247e26cbcb6729a9ebbc5adf80f82bcc6f72
+  metadata.gz: b0b10338cb16cfd88e73dbc87c7a1067855d95477c4cf5a2496f070c7d1f4bc812f0be9f9baaee58622746fae46e34e132c46bf497448a9ea533701670f1d43f
+  data.tar.gz: b5031ceb50be7fcc37cb3f49e75686c4bb07fb87b0c1b29b5068a44b55d69c28c61af5b051de4f74c1b9269b51ecab15f53f226c457ea3da97fbdff768af83c3

data/features/wrap_app.feature

@@ -4,6 +4,7 @@ Feature: Wrap App
   As as user
   I want wrap my App in a DMG
 
+  @announce
   Scenario: Wrap App
     Given an App
     When I wrap the App

data/lib/wrapp/dmg_builder.rb

@@ -1,5 +1,7 @@
 module Wrapp
   class DMGBuilder
+    BIG_SOURCE_FOLDER_SIZE = 100
+
     attr_reader :app_path
 
     def initialize(app_path, opts = {})
@@ -8,7 +10,14 @@ module Wrapp
     end
 
     def create
-      system("hdiutil create '#{dmg_filename}' -srcfolder '#{source_path}'")
+      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(' '))
     end
 
     private
@@ -17,6 +26,21 @@ module Wrapp
       @opts[:include_parent_dir] ? File.dirname(app_path) : app_path
     end
 
+    # @returns [Boolean] true if source folder is bigger or equal then 100MB.
+    def big_source_folder?
+      folder_size >= BIG_SOURCE_FOLDER_SIZE
+    end
+
+    # @returns [Integer] Size of dmg in megabytes.
+    def dmg_size
+      (folder_size * 1.1).to_i # Source folder + 10% buffer.
+    end
+
+    # @returns [Integer] Size of source folder in megabytes.
+    def folder_size
+      `du -ms '#{source_path}'`[/^(\d+)\s+/,1].to_i
+    end
+
     def dmg_filename
       "#{app.full_name}.dmg"
     end

data/lib/wrapp/version.rb

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

data/spec/wrapp/app_info_spec.rb

@@ -35,29 +35,16 @@ module Wrapp
     end
 
     describe '#get_property' do
-      let(:command_line) { double('command_line', :run => '') }
-
-      before do
-        Cocaine::CommandLine.stub(:new).and_return(command_line)
-      end
-
-      it 'builds a new command line object' do
-        Cocaine::CommandLine.should_receive(:new).
-          with('/usr/libexec/PlistBuddy', '-c :cmd :plist').
-          and_return(command_line)
-        app.get_property('Foo')
-      end
-
-      it 'runs the command line with the property' do
-        command_line.should_receive(:run).
-          with(:cmd => 'Print Foo', :plist => 'Info.plist').
+      it 'retrieves the property by PlistBuddy' do
+        app.should_receive(:`).
+          with("/usr/libexec/PlistBuddy -c 'Print :foo' 'Info.plist'").
           and_return('')
-        app.get_property('Foo')
+        app.get_property('foo')
       end
 
       it 'strips the output' do
-        command_line.stub(:run).and_return("Chunky\n")
-        expect(app.get_property('')).to eq('Chunky')
+        app.stub(:`).and_return("Chunky\n")
+        expect(app.get_property(nil)).to eq('Chunky')
       end
 
       it 'raises when plistbuddy exists non-zero' do

data/spec/wrapp/dmg_builder_spec.rb

@@ -10,12 +10,28 @@ module Wrapp
     end
 
     describe '#create' do
-      it 'creates the dmg by hdiutil' do
-        dmg.should_receive(:source_path).and_return('Chunky.app')
-        dmg.should_receive(:dmg_filename).and_return('bacon.dmg')
-        dmg.should_receive(:system).
-          with("hdiutil create 'bacon.dmg' -srcfolder 'Chunky.app'")
-        dmg.create
+      before do
+        dmg.stub(:source_path).and_return('Chunky.app')
+        dmg.stub(:dmg_filename).and_return('bacon.dmg')
+      end
+
+      context 'with big source folder' do
+        it 'creates a dmg with predefined size' do
+          dmg.stub(:big_source_folder?).and_return(true)
+          dmg.stub(:dmg_size).and_return(123)
+          dmg.should_receive(:system).
+            with("hdiutil create -srcfolder 'Chunky.app' -megabytes 123 'bacon.dmg'")
+          dmg.create
+        end
+      end
+
+      context 'with small source folder' do
+        it 'creates a dmg with automatic size' do
+          dmg.stub(:big_source_folder?).and_return(false)
+          dmg.should_receive(:system).
+            with("hdiutil create -srcfolder 'Chunky.app' 'bacon.dmg'")
+          dmg.create
+        end
       end
     end
 
@@ -43,6 +59,39 @@ module Wrapp
       end
     end
 
+    describe '#big_source_folder?' do
+      it 'is true with source folder >= 100MB' do
+        dmg.stub(:folder_size).and_return(100)
+        expect(dmg.send(:big_source_folder?)).to be true
+      end
+
+      it 'is false with source folder < 100MB' do
+        dmg.stub(:folder_size).and_return(99)
+        expect(dmg.send(:big_source_folder?)).to be false
+      end
+    end
+
+    describe '#dmg_size' do
+      it 'returns the folder size + 10% buffer' do
+        dmg.stub(:folder_size).and_return(100)
+        expect(dmg.send(:dmg_size)).to eq(110)
+      end
+    end
+
+    describe '#folder_size' do
+      it 'gets the folder size by du command' do
+        dmg.stub(:source_path).and_return('/chunky/bacon')
+        dmg.should_receive(:`).with("du -ms '/chunky/bacon'").and_return('')
+        dmg.send(:folder_size)
+      end
+
+      it 'returns the folder size plus 10%' do
+        dmg.stub(:source_path).and_return('/chunky/bacon')
+        dmg.stub(:`).and_return('100     /chunky/bacon')
+        expect(dmg.send(:folder_size)).to eq(100)
+      end
+    end
+
     describe '#dmg_filename' do
       it 'includes the full app name' do
         app.should_receive(:full_name).and_return('chunky_bacon_0.4.2')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wrapp
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Björn Albers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-16 00:00:00.000000000 Z
+date: 2014-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
@@ -160,7 +160,7 @@ rubyforge_project:
 rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
-summary: wrapp-0.5.1
+summary: wrapp-0.6.0
 test_files:
 - features/step_definitions/wrapp_steps.rb
 - features/support/app.rb