geoffrey 0.1.0 → 0.1.1

data/Gemfile.lock

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

data/README.md

@@ -40,6 +40,9 @@ provided recipes, and install them.
     >> Moving file to /Applications
     >> Install successful
 
+    $ 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.
+
 API
 ===
 

data/bin/geoffrey

@@ -3,6 +3,7 @@
 
 require 'geoffrey'
 require 'geoffrey/package'
+require 'geoffrey/template'
 require 'geoffrey/cli'
 
 Geoffrey::CLI.start

data/lib/geoffrey.rb

@@ -49,8 +49,7 @@ module Geoffrey
     def package(&block)
       package = Package.new
       package.instance_eval &block
-      package.download_and_decompress
-      package.install
+      package.process
     end
 
     # Help you configure an application editing its +.plist+ file.

data/lib/geoffrey/cli.rb

@@ -19,19 +19,39 @@ module Geoffrey
     method_options :verbose => :boolean
     def install(name)
       if file = file_for_template(name)
-        @package = Geoffrey::Package.new
+        @package = Geoffrey::Template.new(file).package
         @package.verbose(true) if options[:verbose]
-        @package.instance_eval File.read(file)
-        @package.download_and_decompress
-        @package.install
+        @package.process
       else
         puts "Template not found"
         exit 1
       end
     end
 
+    desc "search [pattern]", "search for templates"
+    def search(pattern)
+      fitting_packages = packages.select{ |pack| pack.fits?(pattern) }
+      if fitting_packages && !fitting_packages.empty?
+        fitting_packages.each do |pack|
+          line = pack.name
+          line << ": #{pack.description}" if pack.description && pack.description != ""
+          puts line
+        end
+      else
+        puts "No templates available fit that description"
+      end
+    end
+
   private
 
+    def packages
+      @packages ||= begin
+        list_of_templates.map do |template_file|
+          Geoffrey::Template.new(template_file).package
+        end
+      end
+    end
+
     #--
     # TODO Might be useful for the future to have multiple dirs for templates.
     def templates_dir

data/lib/geoffrey/file_helper.rb

@@ -0,0 +1,14 @@
+module Geoffrey
+  module FileHelper
+
+    def extract_filename(url)
+      url.split("/").last
+      File.basename(url).split("?").first
+    end
+
+    def remove_extension(name)
+      name.split(".").first
+    end
+
+  end
+end

data/lib/geoffrey/package.rb

@@ -4,6 +4,13 @@ require 'open-uri'
 require 'fileutils'
 require 'progressbar'
 require 'geoffrey/reporter'
+require 'geoffrey/file_helper'
+
+class String
+  def escape_path
+    self.gsub(' ','\ ')
+  end
+end
 
 module Geoffrey
 
@@ -14,14 +21,16 @@ module Geoffrey
   class Package
 
     include Geoffrey::Reporter
+    include Geoffrey::FileHelper
 
-    attr_accessor :url, :description, :options, :format, :filename, :dir, :file
+    attr_accessor :url, :description, :options, :format, :filename,
+      :dir, :file, :guessed_name
 
     def initialize
       @options = {}
     end
 
-    [:url,:name,:description,:options].each do |attrib|
+    [:url,:description].each do |attrib|
       class_eval <<-GEOF
         def #{attrib}(val=nil)
           val.nil? ? @#{attrib} : @#{attrib} = val
@@ -29,6 +38,40 @@ module Geoffrey
       GEOF
     end
 
+    # We will do some kind of symbolize_keys, but manually so we don't have to
+    # use activesupport just for this. Pretty much blatantly copied from it :P.
+    def options(val=nil)
+      if !val.nil? && val.is_a?(Hash)
+        @options = {}
+        val.each do |k,v|
+          @options[k.to_sym] = v
+        end
+      end
+      @options
+    end
+
+    def name(val=nil)
+      if val.nil? && @name.nil? && (!@url.nil? || !@guessed_name.nil?)
+        @name = remove_extension(@guessed_name||get_filename)
+      elsif !val.nil?
+        @name = val
+      end
+      @name
+    end
+
+    # Dumb method to get its already defined name, to avoid some precocious
+    # naming
+    def get_name
+      @name
+    end
+
+    # The idea is to put together everything that has to be done after you've
+    # initialized the proper attributes.
+    def process
+      download_and_decompress
+      install
+    end
+
     # Uses the url provided to download the file.
     # Checks the options first to see if it shouldn't be done.
     def download_and_decompress
@@ -55,12 +98,18 @@ module Geoffrey
         FileUtils.mkdir_p dir
       rescue Exception => e
         echo "Can't find file #{@url}"
+        debug "raised an exception #{e}"
+
         raise NotFoundError
       end
 
       decompress
     end
 
+    def fits?(pattern)
+      description.to_s.downcase.match(pattern) || name.to_s.downcase.match(pattern)
+    end
+
     # Does the actual installing of the package
     # For .pkg files it executes installer.
     # For .app files it just moves it to /Applications
@@ -155,7 +204,7 @@ module Geoffrey
     def get_filename
       @filename   = @options[:filename]
       @filename ||= begin
-        escape_whitespaces(File.basename(@url).split("?").first) if @url && @url != ""
+        extract_filename(@url) if @url && @url != ""
       end
     end
 
@@ -187,39 +236,36 @@ module Geoffrey
       raise DecompressionError unless $?.success?
 
       debug "Files after decompression:"
-      debug `ls -la #{dir}`
+      debug `ls -la #{dir.escape_path}`
     end
 
     # Mount the dmg file, copy contents to tmpdir, unmount, remove dmg
-    #--
-    # TODO change system calls with FileUtils maybe?
     def extract_from_dmg
-      execute("mv #{file.path} #{dir}.dmg")
-      str = execute("hdiutil attach #{dir}.dmg 2> /dev/null", :verbose => true)
+      FileUtils.mv file.path, "#{dir}.dmg"
+
+      str = execute("hdiutil attach #{dir.escape_path}.dmg 2> /dev/null", :verbose => true)
+
       if $?.success?
         info    = str.split("\t")
 
-        dmg_dir = escape_whitespaces(info.last.chomp)
+        dmg_dir = info.last.chomp
         debug "the dmg has been mounted here: #{dmg_dir}"
 
         device  = info.first.strip.split("/").last
         debug "the attached device is: #{device}"
 
         debug "These are the files inside the dmg:"
-        debug `ls -la #{dmg_dir}`
+        debug `ls -la #{dmg_dir.escape_path}`
 
-        execute("cp -r #{escape_whitespaces(dmg_dir)}/** #{dir}")
+        FileUtils.cp_r Dir.glob("#{dmg_dir}/**"), dir
 
         debug "Now these in the target"
-        debug `ls -la #{dir}`
+        debug `ls -la #{dir.escape_path}.dmg`
 
         execute("hdiutil detach #{device}")
-        execute("rm -f #{dir}.dmg")
+        FileUtils.rm_f "#{dir}.dmg"
       end
     end
 
-    def escape_whitespaces(path)
-      path.gsub(' ','\ ')
-    end
   end
 end

data/lib/geoffrey/template.rb

@@ -0,0 +1,39 @@
+require 'json'
+require 'open-uri'
+require 'tempfile'
+require 'geoffrey/package'
+require 'geoffrey/file_helper'
+
+module Geoffrey
+  class Template
+    include Geoffrey::FileHelper
+
+    attr_accessor :package, :file
+
+    def initialize(file)
+      @file = file
+      @package = Geoffrey::Package.new
+      set_name_from_file
+      case File.extname(file)
+      when '.rb'
+        package.instance_eval open(file).read
+      when '.json'
+        load_attributes_from_json
+      end
+    end
+
+  private
+
+    def set_name_from_file
+      package.guessed_name = remove_extension(extract_filename(file))
+    end
+
+    def load_attributes_from_json
+      attribs = JSON(open(file).read)
+      ["url","name","description","options"].each do |attr|
+        package.send(:"#{attr}", attribs[attr])
+      end
+    end
+
+  end
+end

data/lib/geoffrey/version.rb

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

data/spec/cli_spec.rb

@@ -1,5 +1,6 @@
 require 'spec_helper'
 
+require 'geoffrey/template'
 require 'geoffrey/cli'
 
 describe Geoffrey::CLI do
@@ -9,7 +10,7 @@ describe Geoffrey::CLI do
     @app.stubs(:templates_dir).returns(File.dirname(__FILE__) + '/templates')
   end
 
-  context 'list' do
+  context 'list command' do
 
     it "prints a list of templates" do
       output = capturing_output { @app.list }
@@ -31,7 +32,24 @@ describe Geoffrey::CLI do
 
   end
 
-  context 'install' do
+  context "search command" do
+
+    # Since we can search by description, it also tests all templates are
+    # loaded and eval'd.
+    it "allows searching by description" do
+      output = capturing_output { @app.search("awesome") }
+      output.should include("growl")
+      output.should include("This package should do awesome stuff")
+    end
+
+    it "prints an error if no pattern fit" do
+      output = capturing_output { @app.search("gorringoringngnng") }
+      output.should include("No templates available")
+    end
+
+  end
+
+  context "install command" do
 
     # Can't really test something's installed for real, so we just expect
     # that it will call the proper methods on the Geoffrey::Package object.

data/spec/package_spec.rb

@@ -4,7 +4,7 @@ require 'geoffrey/package'
 describe Geoffrey::Package do
 
   it "receives different options" do
-    [:url, :name, :description, :options].each do |opt|
+    [:url, :name, :description].each do |opt|
       package = Geoffrey::Package.new
       package.send(opt, 'foo')
       package.send(opt).should == 'foo'
@@ -23,6 +23,36 @@ describe Geoffrey::Package do
     package.options.should == {:yes => "no"}
   end
 
+  context "smart naming" do
+
+    it "gets its name from its url if no name specified" do
+      package = Geoffrey::Package.new
+      package.url "http://www.co.co/adium.zip"
+      package.name.should == "adium"
+    end
+
+    it "gets its name from its name :)" do
+      package = Geoffrey::Package.new
+      package.name "adium"
+      package.name.should == "adium"
+    end
+
+  end
+
+  context "knows if a package matches a pattern" do
+
+    it "really does" do
+      package = Geoffrey::Package.new
+      package.name "mrsimo"
+      package.description "He is a really nice person"
+      package.fits?("mrsimo").should be_true
+      package.fits?("really").should be_true
+      package.fits?("konoha").should be_false
+      package.fits?(/rea..y/).should be_true
+    end
+
+  end
+
   context "package installation" do
 
     # No idea how to test this
@@ -119,8 +149,6 @@ describe Geoffrey::Package do
 
     # Testing with a dmg that has a whitespace as a name because testing dmg's
     # is too slow, so we do it all in one.
-    #--
-    # TODO this test fails :( but it does work in real examples.
     it "also supports .dmg files" do
       package = Geoffrey::Package.new
       package.url(File.dirname(__FILE__) + "/static/test 1.dmg")

data/spec/static/template1.json

@@ -0,0 +1,4 @@
+{
+  "url" : "foo.com",
+  "description" : "bar"
+}

data/spec/static/template1.rb

@@ -0,0 +1,2 @@
+url "foo.com"
+description "bar"

data/spec/static/template2.json

@@ -0,0 +1,9 @@
+{
+  "name" : "fixed_name",
+  "url" : "foo.com",
+  "description" : "bar",
+  "options" : {
+    "sudo" : true
+  }
+}
+

data/spec/template_spec.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+require 'geoffrey/template'
+require 'geoffrey/package'
+
+describe Geoffrey::Template do
+
+  it "knows how to load .rb files" do
+    template = Geoffrey::Template.new(File.dirname(__FILE__) + "/static/template1.rb")
+    template.package.should be_an_instance_of(Geoffrey::Package)
+    template.package.url.should == "foo.com"
+    template.package.description.should == "bar"
+  end
+
+  it "knows how to load .json files" do
+    template = Geoffrey::Template.new(File.dirname(__FILE__) + "/static/template1.json")
+    template.package.should be_an_instance_of(Geoffrey::Package)
+    template.package.url.should == "foo.com"
+    template.package.description.should == "bar"
+  end
+
+  it "smartly changes its name from the file if no name specified inside" do
+    template1 = Geoffrey::Template.new(File.dirname(__FILE__) + "/static/template1.json")
+    template2 = Geoffrey::Template.new(File.dirname(__FILE__) + "/static/template2.json")
+    template1.package.name.should == "template1"
+    template2.package.name.should == "fixed_name"
+  end
+
+  context "packages" do
+
+    it "symbolizes keys of the options parameter" do
+      template = Geoffrey::Template.new(File.dirname(__FILE__) + "/static/template2.json")
+      template.package.options.should == {:sudo => true}
+    end
+
+  end
+
+end

data/spec/templates/simbl.rb

@@ -0,0 +1 @@
+url "http://other.url"

data/templates/burn.json

@@ -0,0 +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"
+}

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Albert Llop
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-10 00:00:00 +02:00
+date: 2010-09-14 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -165,9 +165,11 @@ files:
 - geoffrey.gemspec
 - lib/geoffrey.rb
 - lib/geoffrey/cli.rb
+- lib/geoffrey/file_helper.rb
 - lib/geoffrey/package.rb
 - lib/geoffrey/plist.rb
 - lib/geoffrey/reporter.rb
+- lib/geoffrey/template.rb
 - lib/geoffrey/version.rb
 - spec/cli_spec.rb
 - spec/geoffrey_spec.rb
@@ -177,6 +179,9 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/static/example.plist
+- spec/static/template1.json
+- spec/static/template1.rb
+- spec/static/template2.json
 - spec/static/test 1.dmg
 - spec/static/test.error.dmg
 - spec/static/test.error.gz
@@ -189,9 +194,11 @@ files:
 - spec/static/test.txt.gz.123
 - spec/static/test.txt.zip
 - spec/support/helpers.rb
+- spec/template_spec.rb
 - spec/templates/growl.rb
 - spec/templates/simbl.rb
 - templates/adium.rb
+- templates/burn.json
 - templates/growl.rb
 - templates/skype.rb
 - templates/unrarx.rb