geoffrey 0.0.4 → 0.0.5

data/lib/geoffrey.rb

@@ -7,12 +7,13 @@ 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, .gz and .dmg files. Once extracted it will look for a .pkg
-    # file and try to install it.
+    # supports zip, tar.gz, .gz and .dmg files. Once extracted it will look for
+    # a .pkg or a .app file and try to install it.
     #
     # Some options can be defined:
     #
-    # * +:sudo+ if it has to be executed as sudo.
+    # * +:sudo+ if it has to be executed as sudo. Generally .pkg files that
+    #   ask for a password will require this.
     # * +:unless+ a Proc defining if it doesn't have to try to install it.
     # * +:if+ inverse of inverse
     # * +:file+ what file has to be installed from all of the ones that came in

data/lib/geoffrey/package.rb

@@ -9,7 +9,7 @@ module Geoffrey
   #--
   # TODO add support for .dmg files would be great
   class Package
-    attr_accessor :url, :options, :format, :filename, :dir
+    attr_accessor :url, :options, :format, :filename, :dir, :file
 
     def initialize
       @options = {}
@@ -32,23 +32,21 @@ 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
     def download_and_decompress
-      return nil if shouldnt_install
+      return unless should_install
 
       @filename = @url.split("/").last
       unless @url.nil?
         get_format
 
-        file = Tempfile.new("geoffrey")
-        file.write open(@url).read
-        file.close
+        @file = Tempfile.new("geoffrey")
+        @file.write open(@url).read
+        @file.close
 
-        @dir  = "#{Dir.tmpdir}/#{filename}"
-        FileUtils.rm_rf @dir if File.exist?(@dir)
-        FileUtils.mkdir_p @dir
+        @dir = "#{Dir.tmpdir}/#{filename}"
+        FileUtils.rm_rf dir if File.exist?(dir)
+        FileUtils.mkdir_p dir
 
-        decompress file, @dir
-
-        @dir
+        decompress
       end
     end
 
@@ -56,13 +54,14 @@ module Geoffrey
     #--
     # TODO add support for .app files
     def install
-      return nil if shouldnt_install
+      return unless should_install
 
-      command = case File.extname file_to_install
+      case File.extname file_to_install
       when ".pkg"
-        "installer -pkg #{file_to_install} -target /"
+        execute "installer -pkg #{file_to_install} -target /"
+      when ".app"
+        FileUtils.mv file_to_install, "/Appliactions"
       end
-      execute command
     end
 
     # If it was specified through options, then get that, otherwise
@@ -72,32 +71,36 @@ module Geoffrey
     def file_to_install
       return @file_to_install if defined?(@file_to_install)
       @file_to_install = if @options[:file]
-        "#{@dir}/#{@options[:file]}"
+        "#{dir}/#{@options[:file]}"
       else
-        files = Dir.glob("#{@dir}/**/*.pkg").first
-        files ||= Dir.glob("#{@dir}/**/*").first
+        candidate   = Dir.glob("#{dir}/**/*.pkg").first
+        candidate ||= Dir.glob("#{dir}/**/*.app").first
+        candidate ||= Dir.glob("#{dir}/**/*").first
+        candidate
       end
     end
 
   private
 
-    def shouldnt_install
+    def should_install
       if @options[:unless] && @options[:unless].respond_to?(:call)
-        @options[:unless].call
+        !@options[:unless].call
       elsif @options[:if] && @options[:if].respond_to?(:call)
-        !@options[:if].call
+        @options[:if].call
       else
-        false
+        true
       end
     end
 
     # Simple wrapper to execute things, using sudo or not as per defiend in the
     # options. Useful for debugging too :)
-    def execute(command, options = {})
-      options = @options.merge(options)
-      command = "sudo #{command}" if options[:sudo]
-      puts "Executing: #{command}" if $verbose
-      `#{command}`
+    def execute(command, opts = {})
+      if String === command
+        opts = @options.merge(opts)
+        command = "sudo #{command}" if opts[:sudo]
+        puts "Executing: #{command}" if $verbose
+        `#{command}`
+      end
     end
 
     def get_format
@@ -105,11 +108,9 @@ module Geoffrey
       when '.zip' then :zip
       when '.tar' then :tar
       when '.tgz' then :tgz
-      when '.gz'
-        @filename =~ /\.tar\.gz/ ? :tgz : :gz
+      when '.gz'  then filename =~ /\.tar\.gz/ ? :tgz : :gz
       when '.dmg' then :dmg
-      else
-        :unknown
+      else :unknown
       end
     end
 
@@ -117,36 +118,35 @@ module Geoffrey
     # +#{Dir.tmpdir}/#{filename}+
     #--
     # TODO better isolate each download inside the tmpdir?
-    def decompress(file,target)
-      command = case @format
+    def decompress
+      command = case format
       when :zip
-        "unzip -o #{file.path} -d #{target} 1> /dev/null"
+        execute "unzip -o #{file.path} -d #{dir} 1> /dev/null", :sudo => false
       when :tar
-        "tar xf #{file.path} -C #{target}"
+        execute "tar xf #{file.path} -C #{dir}", :sudo => false
       when :tgz
-        "tar xzf #{file.path} -C #{target}"
+        execute "tar xzf #{file.path} -C #{dir}", :sudo => false
       when :gz
-        "cp #{file.path} #{target}/#{filename}.gz; gunzip #{target}/*"
+        execute "cp #{file.path} #{dir}/#{filename}.gz; gunzip #{dir}/*", :sudo => false
       when :unknown
-        "cp #{file.path} #{target}/#{filename}"
+        execute "cp #{file.path} #{dir}/#{filename}", :sudo => false
       when :dmg
-        extract_from_dmg(file,target)
-        nil
+        extract_from_dmg
       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")
+    # Mount the dmg file, copy contents to tmpdir, unmount, remove dmg
+    def extract_from_dmg
+      execute("mv #{file.path} #{dir}.dmg")
+      str = execute("hdiutil attach #{dir}.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("cp -r #{dmg_dir}/** #{dir}")
         execute("hdiutil detach #{device}")
-        execute("rm -f #{target}.dmg")
+        execute("rm -f #{dir}.dmg")
       end
     end
 

data/lib/geoffrey/version.rb

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

data/spec/spec.opts

@@ -0,0 +1,2 @@
+-f s
+-c

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Albert Llop
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-29 00:00:00 +02:00
+date: 2010-08-30 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -129,6 +129,7 @@ files:
 - lib/geoffrey/version.rb
 - spec/package_spec.rb
 - spec/plist_spec.rb
+- spec/spec.opts
 - spec/spec_helper.rb
 - spec/static/example.plist
 - spec/static/test.dmg