geoffrey 0.0.3 → 0.0.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    geoffrey (0.0.2)
+    geoffrey (0.0.4)
       plist4r
 
 GEM

data/README.md

@@ -7,6 +7,10 @@ This is very early alpha code, use with precaution. It's a spinoff of myself wil
 improve my [dotfiles project](http://github.com/albertllop/dotfiles) a step further. All
 code examples in this README come from it.
 
+## Links
+
+* [Documentation](http://rdoc.info/projects/albertllop/geoffrey) (this README is better viewed there ;)
+
 ## Introduction
 
 Geoffrey's your little helper, that who just wants to makes your life easier.
@@ -39,7 +43,7 @@ what a pain it is to install them every time. Now you can do so with the next pi
       options :sudo => true, :unless => Proc.new{ File.exists?("/Library/LaunchAgents/net.culater.SIMBL.Agent.plist") }
     end
 
-Check the [documentation](http://rdoc.info/albertllop/geoffrey) for more detailed documentation.
+See {Geoffrey::package} for extended documentation.
 
 ## Application Configuration
 
@@ -62,7 +66,7 @@ up and running with Pro scheme, Menlo Font 14pt, and a size 520x100.
       options["Window Settings"]["Pro"]["rowCount"]    = 100
     end
 
-Check the [documentation](http://rdoc.info/albertllop/geoffrey) for more detailed documentation.
+See {Geoffrey::plist} for extended documentation.
 
 ## A few words
 

data/lib/geoffrey.rb

@@ -7,7 +7,7 @@ module Geoffrey
 
     # Define a package installation from the URL specified. It will download
     # the file, and if it's compressed, it will decompress it.It currently
-    # supports zip, tar.gz and .gz files. Once extracted it will look for a .pkg
+    # supports zip, tar.gz, .gz and .dmg files. Once extracted it will look for a .pkg
     # file and try to install it.
     #
     # Some options can be defined:

data/lib/geoffrey/package.rb

@@ -31,7 +31,6 @@ module Geoffrey
     #--
     # TODO raise some error if the file can't be found or something
     # TODO add some option to define the file name for weird url's
-    # TODO ensure you can still download uncompressed files, right?
     def download_and_decompress
       return nil if shouldnt_install
 
@@ -55,7 +54,7 @@ module Geoffrey
 
     # Does the actual installing of the package
     #--
-    # TODO add support for .dmg files
+    # TODO add support for .app files
     def install
       return nil if shouldnt_install
 
@@ -69,7 +68,7 @@ module Geoffrey
     # If it was specified through options, then get that, otherwise
     # get the first file with .pkg extension
     #--
-    # TODO Also use .dmg when support is added
+    # TODO Also use .app when support is added
     def file_to_install
       return @file_to_install if defined?(@file_to_install)
       @file_to_install = if @options[:file]
@@ -98,7 +97,7 @@ module Geoffrey
       options = @options.merge(options)
       command = "sudo #{command}" if options[:sudo]
       puts "Executing: #{command}" if $verbose
-      system command
+      `#{command}`
     end
 
     def get_format
@@ -108,6 +107,7 @@ module Geoffrey
       when '.tgz' then :tgz
       when '.gz'
         @filename =~ /\.tar\.gz/ ? :tgz : :gz
+      when '.dmg' then :dmg
       else
         :unknown
       end
@@ -117,7 +117,6 @@ module Geoffrey
     # +#{Dir.tmpdir}/#{filename}+
     #--
     # TODO better isolate each download inside the tmpdir?
-    # TODO have gzips actually work
     def decompress(file,target)
       command = case @format
       when :zip
@@ -130,8 +129,25 @@ module Geoffrey
         "cp #{file.path} #{target}/#{filename}.gz; gunzip #{target}/*"
       when :unknown
         "cp #{file.path} #{target}/#{filename}"
+      when :dmg
+        extract_from_dmg(file,target)
+        nil
+      end
+      execute command, :sudo => false if command
+    end
+
+
+    def extract_from_dmg(file,target)
+      execute("mv #{file.path} #{target}.dmg")
+      str = execute("hdiutil attach #{target}.dmg")
+      unless $?.exitstatus > 0
+        info    = str.split("\t")
+        dmg_dir = info.last.chomp
+        device  = info.first.strip.split("/").last
+        execute("cp -r #{dmg_dir}/** #{target}")
+        execute("hdiutil detach #{device}")
+        execute("rm -f #{target}.dmg")
       end
-      execute command, :sudo => false
     end
 
   end

data/lib/geoffrey/version.rb

@@ -1,3 +1,3 @@
 module Geoffrey
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/package_spec.rb

@@ -17,9 +17,14 @@ describe Geoffrey::Package do
 
   context "package installation" do
 
+    # No idea how to test this
     it "installs basic package stuff" do
     end
 
+    # No idea how to test this either
+    it "installs .app stuff" do
+    end
+
     it "doesnt install the thing if a :unless option is provided" do
       package = Geoffrey::Package.new
       package.url("whatever")
@@ -69,5 +74,13 @@ describe Geoffrey::Package do
       package.download_and_decompress
       File.read(package.file_to_install).chomp.should == "foo"
     end
+
+    it "also supports .dmg files" do
+      package = Geoffrey::Package.new
+      package.url(File.dirname(__FILE__) + "/static/test.dmg")
+      package.download_and_decompress
+      File.read(package.file_to_install).chomp.should == "foo"
+    end
+
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Albert Llop
@@ -131,6 +131,7 @@ files:
 - spec/plist_spec.rb
 - spec/spec_helper.rb
 - spec/static/example.plist
+- spec/static/test.dmg
 - spec/static/test.tar.gz
 - spec/static/test.tgz
 - spec/static/test.txt