geoffrey 0.1.1 → 0.1.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    geoffrey (0.1.1)
+    geoffrey (0.1.2)
       plist4r
       progressbar
       thor

data/README.md

@@ -40,6 +40,10 @@ provided recipes, and install them.
     >> Moving file to /Applications
     >> Install successful
 
+    $ geoffrey install http://www.example.com/template.json --remote
+    >> Parsing http://www.example.com/template.json
+    ...
+
     $ geoffrey seach jabber
     >> Adium: Adium is a free instant messaging application for Mac OS X that can connect to AIM, MSN, Jabber, Yahoo, and more.
 

data/lib/geoffrey.rb

@@ -27,13 +27,18 @@ module Geoffrey
     #   the compressed file.
     # * +:filename+ set the name of the file you are downloading.
     #
+    # If what you're going to test to see if you have to install something or
+    # not is the existance of a file (most likely), you can just specify the
+    # path in a creates statement (see examples).
+    #
     # If you don't want to install a .pkg but do something else, you can just
     # override the install method. See the examples
     #
     # @example
     #  Geoffrey.package do
     #    url 'http://www.culater.net/dl/files/SIMBL-0.9.7a.zip'
-    #    options :sudo => true, :unless => Proc.new{ File.exists?("/Library/LaunchAgents/net.culater.SIMBL.Agent.plist") }
+    #    creates "/Library/LaunchAgents/net.culater.SIMBL.Agent.plist"
+    #    options :sudo => true
     #  end
     #
     # @example

data/lib/geoffrey/cli.rb

@@ -15,16 +15,34 @@ module Geoffrey
       puts names.join(' ')
     end
 
-    desc "install [template]", "install the specified template"
-    method_options :verbose => :boolean
-    def install(name)
-      if file = file_for_template(name)
-        @package = Geoffrey::Template.new(file).package
-        @package.verbose(true) if options[:verbose]
-        @package.process
+    desc "install [template] [options]", "install the specified template"
+    method_options :verbose => :boolean, :remote => :boolean
+    def install(*names)
+
+      templates_to_install = []
+
+      # if a remote flag is on, then we'll take the parameter as an url, and will
+      # then fetch it directly instead of looking for it in the filesystem
+      # templates.
+      if options[:remote]
+        templates_to_install << names.join
       else
+        names.each do |name|
+          if file = file_for_template(name)
+            templates_to_install << file
+          end
+        end
+      end
+
+      if templates_to_install.empty?
         puts "Template not found"
         exit 1
+      else
+        templates_to_install.each do |template|
+          package = Geoffrey::Template.new(template).package
+          package.verbose(true) if options[:verbose]
+          package.process
+        end
       end
     end
 

data/lib/geoffrey/package.rb

@@ -24,13 +24,13 @@ module Geoffrey
     include Geoffrey::FileHelper
 
     attr_accessor :url, :description, :options, :format, :filename,
-      :dir, :file, :guessed_name
+      :dir, :file, :guessed_name, :creates
 
     def initialize
       @options = {}
     end
 
-    [:url,:description].each do |attrib|
+    [:url,:description,:creates].each do |attrib|
       class_eval <<-GEOF
         def #{attrib}(val=nil)
           val.nil? ? @#{attrib} : @#{attrib} = val
@@ -148,7 +148,9 @@ module Geoffrey
 
     def should_install
       ok_to_go = if @url && @url != ""
-        if @options[:unless] && @options[:unless].respond_to?(:call)
+        if @creates
+          !File.exists?(@creates)
+        elsif @options[:unless] && @options[:unless].respond_to?(:call)
           !@options[:unless].call
         elsif @options[:if] && @options[:if].respond_to?(:call)
           @options[:if].call
@@ -158,8 +160,8 @@ module Geoffrey
       else
         false
       end
-       echo "#{filename} is already installed." unless ok_to_go
-       ok_to_go
+      echo "#{filename} is already installed." unless ok_to_go
+      ok_to_go
     end
 
     # Simple wrapper to execute things, using sudo or not as per defiend in the

data/lib/geoffrey/version.rb

@@ -1,3 +1,3 @@
 module Geoffrey
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/cli_spec.rb

@@ -62,6 +62,22 @@ describe Geoffrey::CLI do
       @app.install("growl")
     end
 
+    it "can install multiple packages" do
+      Geoffrey::Package.any_instance.expects(:install).twice.returns(nil)
+      Geoffrey::Package.any_instance.expects(:download_and_decompress).twice.returns(nil)
+      @app.install("growl","simbl")
+    end
+
+    it "can take remote packages" do
+      Geoffrey::Package.any_instance.expects(:url).with("foo.com")
+      Geoffrey::Package.any_instance.expects(:download_and_decompress).once.returns(nil)
+      Geoffrey::Package.any_instance.expects(:install).once
+      path = File.dirname(__FILE__) + "/static/template1.json"
+      @app.stubs(:options).returns(:remote => true)
+      @app.stubs(:names).returns([path])
+      @app.install(path)
+    end
+
   end
 
   #--

data/spec/package_spec.rb

@@ -90,6 +90,16 @@ describe Geoffrey::Package do
       end
     end
 
+    it "allows for the definition of a 'creates' to serve as a shortcut for :unless => File.exists?" do
+      capturing_output do
+        package = Geoffrey::Package.new
+        package.url("whatever")
+        package.creates(__FILE__) # It always exists
+        package.download_and_decompress.should == nil
+        package.install.should == nil
+      end
+    end
+
   end
 
   # Things should be uncompressed into a temporary folder, and the

data/templates/burn.json

@@ -1,4 +1,4 @@
 {
   "url" : "http://downloads.sourceforge.net/project/burn-osx/Burn/2.4.1/Burn241u.zip?r=http%3A%2F%2Fburn-osx.sourceforge.net%2FPages%2FEnglish%2Fhome.html&ts=1284476617&use_mirror=ovh",
-  "description" : "Simple but advanced burning for Mac OS X"
+  "description" : "Burn: simple but advanced burning for Mac OS X"
 }

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Albert Llop
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-14 00:00:00 +02:00
+date: 2010-09-19 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency