geoffrey 0.0.5 → 0.0.6

data/Gemfile.lock

@@ -1,26 +1,26 @@
 PATH
   remote: .
   specs:
-    geoffrey (0.0.4)
+    geoffrey (0.0.5)
       plist4r
 
 GEM
   remote: http://rubygems.org/
   specs:
     bluecloth (2.0.7)
-    haml (3.0.17)
+    haml (3.0.18)
     libxml-ruby (1.1.4)
     libxml4r (0.2.6)
       libxml-ruby (>= 1.1.3)
     mocha (0.9.8)
       rake
-    plist4r (1.1.1)
+    plist4r (1.1.5)
       haml
       libxml-ruby
       libxml4r
     rake (0.8.7)
     rspec (1.3.0)
-    yard (0.5.8)
+    yard (0.6.0)
 
 PLATFORMS
   ruby
@@ -32,4 +32,4 @@ DEPENDENCIES
   mocha (~> 0.9.8)
   plist4r
   rspec (~> 1.3.0)
-  yard (~> 0.5.8)
+  yard (~> 0.6.0)

data/README.md

@@ -4,12 +4,12 @@ geoffrey
 ## ALERT!
 
 This is very early alpha code, use with precaution. It's a spinoff of myself willing to
-improve my [dotfiles project](http://github.com/albertllop/dotfiles) a step further. All
+improve my [dotfiles project](http://github.com/mrsimo/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 ;)
+* [Documentation](http://rubydoc.info/gems/geoffrey/frames) (this README is better viewed there ;)
 
 ## Introduction
 
@@ -60,7 +60,7 @@ up and running with Pro scheme, Menlo Font 14pt, and a size 520x100.
       options["Default Window Settings"] = "Pro"
       options["Startup Window Settings"] = "Pro"
       options["HasMigratedDefaults"] = true
-      options["Window Settings"]["Pro"]["Font"] = "bplist00\xD4\x01\x02\x03\x04\x05\x06\x18\x19X$versionX$objectsY$archiverT$top\x12\x00\x01\x86\xA0\xA4\a\b\x11\x12U$null\xD4\t\n\v\f\r\x0E\x0F\x10V$classVNSNameVNSSizeXNSfFlags\x80\x03\x80\x02\#@,\x00\x00\x00\x00\x00\x00\x10\x10]Menlo-Regular\xD2\x13\x14\x15\x16Z$classnameX$classesVNSFont\xA2\x15\x17XNSObject_\x10\x0FNSKeyedArchiver\xD1\x1A\eTroot\x80\x01\b\x11\x1A#-27<BKRY`ikmvx\x86\x8B\x96\x9F\xA6\xA9\xB2\xC4\xC7\xCC\x00\x00\x00\x00\x00\x00\x01\x01\x00\x00\x00\x00\x00\x00\x00\x1C\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xCE"
+      options["Window Settings"]["Pro"]["Font"] = "bplist00\xD4\x01\x02\x03\x04\x05\x06\x18\x19X$version(..)"
       options["Window Settings"]["Pro"]["Font"].blob = true
       options["Window Settings"]["Pro"]["columnCount"] = 520
       options["Window Settings"]["Pro"]["rowCount"]    = 100
@@ -71,6 +71,6 @@ See {Geoffrey::plist} for extended documentation.
 ## A few words
 
 This is work done in my free hours, it's not yet finished. The code is dirty and mainly undocumented. It all started on #whyday,
-but I'm so lazy that I've needed a lot of time to do just this. 
+but I'm so lazy that I've needed a lot of time to do just this.
 
 Thanks!

data/geoffrey.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "bundler", "~> 1.0.0.rc.5"
   s.add_development_dependency "rspec", "~> 1.3.0"
   s.add_development_dependency "mocha", "~> 0.9.8"
-  s.add_development_dependency "yard", "~> 0.5.8"
+  s.add_development_dependency "yard", "~> 0.6.0"
   s.add_development_dependency "bluecloth", "~> 2.0.7"
 
   s.add_dependency 'plist4r'

data/lib/geoffrey/package.rb

@@ -5,9 +5,10 @@ require 'fileutils'
 
 module Geoffrey
 
+  class NotFoundError < Exception; end
+  class DecompressionError < Exception; end
+
   # This class helps installing packages and other apps into your system.
-  #--
-  # TODO add support for .dmg files would be great
   class Package
     attr_accessor :url, :options, :format, :filename, :dir, :file
 
@@ -29,30 +30,35 @@ module Geoffrey
     # Uses the url provided to download the file.
     # Checks the options first to see if it shouldn't be done.
     #--
-    # 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 unless should_install
 
-      @filename = @url.split("/").last
-      unless @url.nil?
-        get_format
-
+      begin
         @file = Tempfile.new("geoffrey")
         @file.write open(@url).read
         @file.close
 
+        @filename = @url.split("/").last
+        get_format
+
+
         @dir = "#{Dir.tmpdir}/#{filename}"
         FileUtils.rm_rf dir if File.exist?(dir)
         FileUtils.mkdir_p dir
-
-        decompress
+      rescue
+        raise NotFoundError
       end
+
+      decompress
     end
 
     # Does the actual installing of the package
+    # For .pkg files it executes installer.
+    # For .app files it just moves it to /Applications
     #--
-    # TODO add support for .app files
+    # TODO maybe add more customization options
+    # TODO investigate other possible extensions.
     def install
       return unless should_install
 
@@ -66,8 +72,6 @@ module Geoffrey
 
     # If it was specified through options, then get that, otherwise
     # get the first file with .pkg extension
-    #--
-    # 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 +102,7 @@ module Geoffrey
       if String === command
         opts = @options.merge(opts)
         command = "sudo #{command}" if opts[:sudo]
-        puts "Executing: #{command}" if $verbose
+        command = "#{command} > /dev/null 2>&1" unless opts[:verbose]
         `#{command}`
       end
     end
@@ -117,11 +121,15 @@ module Geoffrey
     # Actual decompressing of the file. Does so into a directory we created in
     # +#{Dir.tmpdir}/#{filename}+
     #--
-    # TODO better isolate each download inside the tmpdir?
+    # TODO control errors. Maybe it's .zip but just doesn't work.
+    # TODO better isolate each download inside the tmpdir? When debugging it's
+    #   misleading to have a folder with the file name and extension.
+    #   * Timestamp if clash?
+    #   * Random string?
     def decompress
       command = case format
       when :zip
-        execute "unzip -o #{file.path} -d #{dir} 1> /dev/null", :sudo => false
+        execute "unzip -o #{file.path} -d #{dir}", :sudo => false
       when :tar
         execute "tar xf #{file.path} -C #{dir}", :sudo => false
       when :tgz
@@ -133,14 +141,16 @@ module Geoffrey
       when :dmg
         extract_from_dmg
       end
-    end
 
+      # Might be that the decompression failed
+      raise DecompressionError unless $?.success?
+    end
 
     # 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
+      str = execute("hdiutil attach #{dir}.dmg 2> /dev/null", :verbose => true)
+      if $?.success?
         info    = str.split("\t")
         dmg_dir = info.last.chomp
         device  = info.first.strip.split("/").last

data/lib/geoffrey/version.rb

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

data/spec/package_spec.rb

@@ -18,10 +18,17 @@ describe Geoffrey::Package do
   context "package installation" do
 
     # No idea how to test this
+    # TODO find a way
+    #   Ideas:
+    #     * Just suppose that the instruction is executed
     it "installs basic package stuff" do
     end
 
     # No idea how to test this either
+    # TODO find a way
+    #   Ideas:
+    #     * Have an "install directory" which is different in test environment
+    #     * Then check that files are inside and with proper permissions
     it "installs .app stuff" do
     end
 
@@ -47,6 +54,20 @@ describe Geoffrey::Package do
   # method should return where it is.
   context 'package downloading/uncompressing' do
 
+    it "raises an error if the file can't be found/read" do
+      package = Geoffrey::Package.new
+      package.url 'really/impossible/to/exist.dmg'
+      lambda { package.download_and_decompress}.should raise_exception(Geoffrey::NotFoundError)
+    end
+
+    it "raises an error if the file has bad format" do
+      ["zip","tar.gz","gz","dmg"].each do |extension|
+        package = Geoffrey::Package.new
+        package.url(File.dirname(__FILE__) + "/static/test.error.#{extension}")
+        lambda { package.download_and_decompress }.should raise_exception(Geoffrey::DecompressionError)
+      end
+    end
+
     it "doesn't do anything if it's an unknown format" do
       package = Geoffrey::Package.new
       package.url(File.dirname(__FILE__) + "/static/test.txt")

data/spec/static/test.error.dmg

@@ -0,0 +1 @@
+foo

data/spec/static/test.error.gz

@@ -0,0 +1 @@
+foo

data/spec/static/test.error.tar.gz

@@ -0,0 +1 @@
+foo

data/spec/static/test.error.zip

@@ -0,0 +1 @@
+foo

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: geoffrey
 version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Albert Llop
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-30 00:00:00 +02:00
+date: 2010-08-31 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,6 +26,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 15424063
         segments: 
         - 1
         - 0
@@ -42,6 +44,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 1
         - 3
@@ -57,6 +60,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 43
         segments: 
         - 0
         - 9
@@ -72,11 +76,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 0
-        - 5
-        - 8
-        version: 0.5.8
+        - 6
+        - 0
+        version: 0.6.0
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -87,6 +92,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 1
         segments: 
         - 2
         - 0
@@ -102,6 +108,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -133,6 +140,10 @@ files:
 - spec/spec_helper.rb
 - spec/static/example.plist
 - spec/static/test.dmg
+- spec/static/test.error.dmg
+- spec/static/test.error.gz
+- spec/static/test.error.tar.gz
+- spec/static/test.error.zip
 - spec/static/test.tar.gz
 - spec/static/test.tgz
 - spec/static/test.txt
@@ -152,6 +163,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -160,6 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 23
       segments: 
       - 1
       - 3