geoffrey 0.0.2 → 0.0.3

data/README.md

@@ -39,32 +39,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
 
-Geoffrey will take care of downloading the zip file, and install whatever .pkg
-file is in the zip. The possible options are:
-
-* `:sudo` => in case it needs to be executed as sudo to install (it does if the installer would ever ask for your password)
-* `:unless` => in order to make running this idempotent.
-* `:file` => specify which of the files contained in the zip has to be installed. If it's not specified it uses the first .pkg it finds.
-
-With that you'll have SIMBL installed and working. Now suppose you want to install a bundle.
-You'd have to download a file, and move it to a directory. Geoffrey can help you a little,
-basically downloading and uncompressing the zip, and you just have to define the install
-method.
-
-    require 'geoffrey'
-    Geoffrey.package do
-      url "http://github.com/dabeeeenster/terminaltabswitching/raw/master/TerminalTabSwitching.bundle.zip"
-      options :file => "TerminalTabSwitching.bundle"
-
-      def install
-        plugins_dir = "#{ENV["HOME"]}/Library/Application Support/SIMBL/Plugins"
-        FileUtils.mkdir_p plugins_dir
-        FileUtils.mv file_to_install, plugins_dir, :force => true
-      end
-
-    end
-
-`file_to_install` is provided by geoffrey poiting to the automatically downloaded/uncompressed file.
+Check the [documentation](http://rdoc.info/albertllop/geoffrey) for more detailed documentation.
 
 ## Application Configuration
 
@@ -87,26 +62,7 @@ up and running with Pro scheme, Menlo Font 14pt, and a size 520x100.
       options["Window Settings"]["Pro"]["rowCount"]    = 100
     end
 
-* `file` => Geoffrey knows of a few files in your system you can specify with symbols. If you want to work with a different one, just write the full path.
-* `affects` => When you close Terminal.app, it'll dump its otions into the plist. So you have to stop it, change the plist file, then reopen it. Geoffrey does this automatically if you tell him what must be rebooted.
-* `options` => Its the plist has per se. Using the fantastic [plist4r](http://github.com/dreamcat4/plist4r) gem, you can modify it.
-
-You might have seen something peculiar:
-
-    options["Window Settings"]["Pro"]["Font"].blob = true
-
-Some values in plist files are of type "Data", which is just binary stuff. Plist4r handles
-these as strings with a special flag.
-
-The best way to know what to put in every value, is to just go to the file and take a
-look. They all tend to make sense. For data values, however, you might have more work. The
-way I do it is opening the file with Plist4r, and reading the value:
-
-    require 'plist4r'
-    plist = Plist4r.open("the/file.plist")
-    plist["whatever"]["option"] # => copy whatever it returns
-
-Just make sure that when you set it in your geoffrey you put the flag blog true. Otherwise you might see some really weird system errors.
+Check the [documentation](http://rdoc.info/albertllop/geoffrey) for more detailed documentation.
 
 ## A few words
 

data/lib/geoffrey.rb

@@ -7,13 +7,14 @@ 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 and tar.gz files. Once extracted it will look for a .pkg
+    # supports zip, tar.gz and .gz files. Once extracted it will look for a .pkg
     # file and try to install it.
     #
     # Some options can be defined:
     #
     # * +:sudo+ if it has to be executed as sudo.
     # * +: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
     #   the compressed file.
     #

data/lib/geoffrey/package.rb

@@ -66,10 +66,30 @@ module Geoffrey
       execute command
     end
 
+    # 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
+    def file_to_install
+      return @file_to_install if defined?(@file_to_install)
+      @file_to_install = if @options[:file]
+        "#{@dir}/#{@options[:file]}"
+      else
+        files = Dir.glob("#{@dir}/**/*.pkg").first
+        files ||= Dir.glob("#{@dir}/**/*").first
+      end
+    end
+
   private
 
     def shouldnt_install
-      @options[:unless] && @options[:unless].respond_to?(:call) && @options[:unless].call
+      if @options[:unless] && @options[:unless].respond_to?(:call)
+        @options[:unless].call
+      elsif @options[:if] && @options[:if].respond_to?(:call)
+        !@options[:if].call
+      else
+        false
+      end
     end
 
     # Simple wrapper to execute things, using sudo or not as per defiend in the
@@ -81,30 +101,15 @@ module Geoffrey
       system command
     end
 
-    # 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
-    def file_to_install
-      if @options[:file]
-        "#{@dir}/#{@options[:file]}"
-      else
-        files = Dir.glob("#{@dir}/**/*.pkg")
-        files.first
-      end
-    end
-
     def get_format
       @format = case File.extname @url
       when '.zip' then :zip
       when '.tar' then :tar
       when '.tgz' then :tgz
       when '.gz'
-        if @filename =~ /\.tar\.gz/
-          :tgz
-        else
-          :gz
-        end
+        @filename =~ /\.tar\.gz/ ? :tgz : :gz
+      else
+        :unknown
       end
     end
 
@@ -123,6 +128,8 @@ module Geoffrey
         "tar xzf #{file.path} -C #{target}"
       when :gz
         "cp #{file.path} #{target}/#{filename}.gz; gunzip #{target}/*"
+      when :unknown
+        "cp #{file.path} #{target}/#{filename}"
       end
       execute command, :sudo => false
     end

data/lib/geoffrey/version.rb

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

data/spec/package_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 require 'geoffrey/package'
 
 describe Geoffrey::Package do
+
   it "allows for the url to be specified" do
     package = Geoffrey::Package.new
     package.url 'http://localhost/crappy.zip'
@@ -17,48 +18,56 @@ describe Geoffrey::Package do
   context "package installation" do
 
     it "installs basic package stuff" do
-
     end
 
     it "doesnt install the thing if a :unless option is provided" do
-
+      package = Geoffrey::Package.new
+      package.url("whatever")
+      package.options :unless => Proc.new { true }
+      package.download_and_decompress.should == nil
+      package.install.should == nil
     end
 
     it "inverse if passed a :if option" do
-
+      package = Geoffrey::Package.new
+      package.url("whatever")
+      package.options :if => Proc.new { false }
+      package.download_and_decompress.should == nil
+      package.install.should == nil
     end
 
   end
 
-  context 'package downloading/unzipping' do
-    # Things should be uncompressed into a temporary folder, and the
-    # method should return where it is.
+  # Things should be uncompressed into a temporary folder, and the
+  # method should return where it is.
+  context 'package downloading/uncompressing' do
+
+    it "doesn't do anything if it's an unknown format" do
+      package = Geoffrey::Package.new
+      package.url(File.dirname(__FILE__) + "/static/test.txt")
+      package.download_and_decompress
+      File.read(package.file_to_install).chomp.should == "foo"
+    end
 
     it "smartly unzips the file if it's a zip" do
       package = Geoffrey::Package.new
       package.url(File.dirname(__FILE__) + "/static/test.txt.zip")
-      dir = package.download_and_decompress
-      files = Dir.glob("#{dir}/*")
-      files.size.should == 1
-      files.last.split("/").last.should == "test.txt"
+      package.download_and_decompress
+      File.read(package.file_to_install).chomp.should == "foo"
     end
 
     it "smartly untars the tar if it's a tar" do
       package = Geoffrey::Package.new
       package.url(File.dirname(__FILE__) + "/static/test.tar.gz")
-      dir = package.download_and_decompress
-      files = Dir.glob("#{dir}/*")
-      files.size.should == 1
-      files.last.split("/").last.should == "test.txt"
+      package.download_and_decompress
+      File.read(package.file_to_install).chomp.should == "foo"
     end
 
-    # it "smartly ungzips if its a gzip" do
-    #   package = Geoffrey::Package.new
-    #   package.url(File.dirname(__FILE__) + "/static/test.txt.gz")
-    #   dir = package.download_and_decompress
-    #   files = Dir.glob("#{dir}/*")
-    #   files.size.should == 1
-    #   files.last.split("/").last.should == "test.txt"
-    # end
+    it "smartly ungzips if its a gzip" do
+      package = Geoffrey::Package.new
+      package.url(File.dirname(__FILE__) + "/static/test.txt.gz")
+      package.download_and_decompress
+      File.read(package.file_to_install).chomp.should == "foo"
+    end
   end
 end

data/spec/static/test.txt

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

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Albert Llop
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-28 00:00:00 +02:00
+date: 2010-08-29 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -133,9 +133,9 @@ files:
 - spec/static/example.plist
 - spec/static/test.tar.gz
 - spec/static/test.tgz
+- spec/static/test.txt
 - spec/static/test.txt.gz
 - spec/static/test.txt.zip
-- spec/template_spec.rb
 has_rdoc: true
 homepage: 
 licenses: []

data/spec/template_spec.rb

@@ -1,26 +0,0 @@
-require 'spec_helper'
-require 'geoffrey/template'
-
-class SimpleTest < Geoffrey::Template
-  title "Simple template test"
-  description "It does really nice stuff"
-end
-
-class ExtraTest < Geoffrey::Template
-  title "A more advanced test"
-  description "It does even nicer stuff"
-end
-
-describe Geoffrey::Template do
-
-  it "globally knows of all the described templates" do
-    Geoffrey::Template.all.should == [SimpleTest, ExtraTest]
-  end
-
-  it "provides a basic way to describe actions" do
-    SimpleTest.title.should == "Simple template test"
-    ExtraTest.title.should == "A more advanced test"
-    SimpleTest.description.should == "It does really nice stuff"
-    ExtraTest.description.should == "It does even nicer stuff"
-  end
-end