geoffrey 0.0.6 → 0.1.0

data/.gitignore

@@ -3,3 +3,4 @@ pkg/*
 .bundle
 .yardoc
 doc
+log

data/Gemfile.lock

@@ -1,12 +1,15 @@
 PATH
   remote: .
   specs:
-    geoffrey (0.0.5)
+    geoffrey (0.1.0)
       plist4r
+      progressbar
+      thor
 
 GEM
   remote: http://rubygems.org/
   specs:
+    autotest (4.3.2)
     bluecloth (2.0.7)
     haml (3.0.18)
     libxml-ruby (1.1.4)
@@ -18,18 +21,23 @@ GEM
       haml
       libxml-ruby
       libxml4r
+    progressbar (0.9.0)
     rake (0.8.7)
     rspec (1.3.0)
+    thor (0.14.0)
     yard (0.6.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  autotest
   bluecloth (~> 2.0.7)
   bundler (~> 1.0.0.rc.5)
   geoffrey!
   mocha (~> 0.9.8)
   plist4r
+  progressbar
   rspec (~> 1.3.0)
+  thor
   yard (~> 0.6.0)

data/README.md

@@ -1,12 +1,6 @@
 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/mrsimo/dotfiles) a step further. All
-code examples in this README come from it.
-
 ## Links
 
 * [Documentation](http://rubydoc.info/gems/geoffrey/frames) (this README is better viewed there ;)
@@ -14,10 +8,13 @@ code examples in this README come from it.
 ## Introduction
 
 Geoffrey's your little helper, that who just wants to makes your life easier.
+It helps you install applications into your OS X system.
+
+It will help you in two ways, with a command line application, and an API to
+let you create your own recipes.
 
-It aims to help you create little scripts to setup your OSX the way you like.
-If, like me, you use different computers at work, home, or even when travelling,
-you'll know it's a pain in the ass to keep everything up to date.
+If, like me, you use different computers at work, home, or even when
+travelling, you'll know it's a pain in the ass to keep everything up to date.
 
 Inspired in the numerous dotfiles projects, specially
 [holman's](http://github.com/holman/dotfiles),
@@ -27,8 +24,24 @@ the intention is to bring customization to a bigger extend.
 
      $ [sudo] gem install geoffrey
 
-Geoffrey's Talents
-==================
+Command line
+============
+
+Type `geoffrey` to see help with the commands. Right now you can list the
+provided recipes, and install them.
+
+    $ geoffrey list
+    adium growl skype unrarx
+
+    $ geoffrey install adium
+    >> Adium is a free instant messaging application for Mac OS X that can connect to AIM, MSN, Jabber, Yahoo, and more.
+    >> Downloading http://adiumx.cachefly.net/Adium_1.3.10.dmg
+    :              100% |oooooooooooooooooooooooo|  21.3MB 451.6KB/s ETA:  00:00:00
+    >> Moving file to /Applications
+    >> Install successful
+
+API
+===
 
 Geoffrey has many talents, and thus you'll find he can help you in one of these areas:
 
@@ -67,10 +80,3 @@ up and running with Pro scheme, Menlo Font 14pt, and a size 520x100.
     end
 
 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.
-
-Thanks!

data/Rakefile

@@ -1,9 +1,11 @@
 require 'bundler'
 Bundler::GemHelper.install_tasks
+require 'spec/rake/spectask'
+require 'mocha'
 
 desc "Execute specs"
-task :spec do
-  puts `bundle exec spec spec`
+Spec::Rake::SpecTask.new('spec') do |t|
+  t.spec_files = FileList['spec/**/*.rb'].reject{|f| f =~ /templates/ }
 end
 
 desc "Generate docs"

data/bin/geoffrey

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+# -*- encoding: utf-8 -*-
+
+require 'geoffrey'
+require 'geoffrey/package'
+require 'geoffrey/cli'
+
+Geoffrey::CLI.start

data/geoffrey.gemspec

@@ -16,13 +16,16 @@ 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 "autotest"
   s.add_development_dependency "mocha", "~> 0.9.8"
   s.add_development_dependency "yard", "~> 0.6.0"
   s.add_development_dependency "bluecloth", "~> 2.0.7"
 
   s.add_dependency 'plist4r'
+  s.add_dependency 'progressbar'
+  s.add_dependency 'thor'
 
   s.files        = `git ls-files`.split("\n")
-  s.executables  = `git ls-files`.split("\n").select{|f| f =~ /^bin/}
+  s.executables  = ['geoffrey']
   s.require_path = 'lib'
 end

data/lib/geoffrey.rb

@@ -5,6 +5,13 @@ module Geoffrey
 
   class << self
 
+    def environment=(value)
+      @@environment = value if value
+    end
+    def environment
+      @@environment ||= :production
+    end
+
     # 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
@@ -18,6 +25,7 @@ module Geoffrey
     # * +:if+ inverse of inverse
     # * +:file+ what file has to be installed from all of the ones that came in
     #   the compressed file.
+    # * +:filename+ set the name of the file you are downloading.
     #
     # If you don't want to install a .pkg but do something else, you can just
     # override the install method. See the examples

data/lib/geoffrey/cli.rb

@@ -0,0 +1,58 @@
+require 'thor'
+
+module Geoffrey
+  class CLI < Thor
+
+    attr_accessor :package
+
+    desc "list", "list of all the available templates"
+    def list(filter = '')
+      names = if filter && filter != ''
+        list_of_template_names.select{ |name| name.downcase.include?(filter.downcase) }
+      else
+        list_of_template_names
+      end
+      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::Package.new
+        @package.verbose(true) if options[:verbose]
+        @package.instance_eval File.read(file)
+        @package.download_and_decompress
+        @package.install
+      else
+        puts "Template not found"
+        exit 1
+      end
+    end
+
+  private
+
+    #--
+    # TODO Might be useful for the future to have multiple dirs for templates.
+    def templates_dir
+      File.dirname(__FILE__) + '/../../templates'
+    end
+
+    def list_of_templates
+      Dir[templates_dir + '/*']
+    end
+
+    def list_of_template_names
+      list_of_templates.map{ |file| name_from_file(file) }
+    end
+
+    def file_for_template(name)
+      list_of_templates.select{ |file| name_from_file(file) == name }.first
+    end
+
+    def name_from_file(file)
+      file.split("/").last.split(".").first
+    end
+
+  end
+end

data/lib/geoffrey/package.rb

@@ -2,6 +2,8 @@ require 'tmpdir'
 require 'tempfile'
 require 'open-uri'
 require 'fileutils'
+require 'progressbar'
+require 'geoffrey/reporter'
 
 module Geoffrey
 
@@ -10,43 +12,49 @@ module Geoffrey
 
   # This class helps installing packages and other apps into your system.
   class Package
-    attr_accessor :url, :options, :format, :filename, :dir, :file
+
+    include Geoffrey::Reporter
+
+    attr_accessor :url, :description, :options, :format, :filename, :dir, :file
 
     def initialize
       @options = {}
     end
 
-    # Accepts anything parseable by URI
-    def url(val = nil)
-      @url = val if val
-      @url
-    end
-
-    def options(val = nil)
-      @options = val if val
-      @options
+    [:url,:name,:description,:options].each do |attrib|
+      class_eval <<-GEOF
+        def #{attrib}(val=nil)
+          val.nil? ? @#{attrib} : @#{attrib} = val
+        end
+      GEOF
     end
 
     # Uses the url provided to download the file.
     # Checks the options first to see if it shouldn't be done.
-    #--
-    # TODO add some option to define the file name for weird url's
     def download_and_decompress
+      echo "URL not specified" unless @url && @url != ""
+
+      get_filename and debug("filename detected: #{@filename}")
+
       return unless should_install
 
+      echo @description if @description && @description != ""
+
       begin
-        @file = Tempfile.new("geoffrey")
-        @file.write open(@url).read
+        @file = Tempfile.new("geoffrey") and debug("downloading file into #{@file.path}")
+
+        read_with_progress_bar
         @file.close
 
-        @filename = @url.split("/").last
-        get_format
+        get_format and debug("format detected: #{@format}")
 
 
-        @dir = "#{Dir.tmpdir}/#{filename}"
+        @dir = "#{Dir.tmpdir}/#{filename}" and debug("will put files into temporary dir: #{@dir}")
+
         FileUtils.rm_rf dir if File.exist?(dir)
         FileUtils.mkdir_p dir
-      rescue
+      rescue Exception => e
+        echo "Can't find file #{@url}"
         raise NotFoundError
       end
 
@@ -64,10 +72,13 @@ module Geoffrey
 
       case File.extname file_to_install
       when ".pkg"
+        echo "Installing package"
         execute "installer -pkg #{file_to_install} -target /"
       when ".app"
-        FileUtils.mv file_to_install, "/Appliactions"
+        echo "Moving file to /Applications"
+        FileUtils.mv file_to_install, "/Applications"
       end
+      echo "Install successful"
     end
 
     # If it was specified through options, then get that, otherwise
@@ -87,13 +98,19 @@ module Geoffrey
   private
 
     def should_install
-      if @options[:unless] && @options[:unless].respond_to?(:call)
-        !@options[:unless].call
-      elsif @options[:if] && @options[:if].respond_to?(:call)
-        @options[:if].call
+      ok_to_go = if @url && @url != ""
+        if @options[:unless] && @options[:unless].respond_to?(:call)
+          !@options[:unless].call
+        elsif @options[:if] && @options[:if].respond_to?(:call)
+          @options[:if].call
+        else
+          true
+        end
       else
-        true
+        false
       end
+       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
@@ -103,12 +120,29 @@ module Geoffrey
         opts = @options.merge(opts)
         command = "sudo #{command}" if opts[:sudo]
         command = "#{command} > /dev/null 2>&1" unless opts[:verbose]
-        `#{command}`
+        debug "-- executing: #{command}"
+        returned = `#{command}`
+        debug "-- returned:"
+        debug returned
+        returned
       end
     end
 
+    def read_with_progress_bar
+      pbar = nil
+      open(@url, :content_length_proc => lambda { |t|
+        if t && t > 0
+          echo "Downloading #{@url}"
+          pbar = ProgressBar.new("",t)
+          pbar.file_transfer_mode
+        end
+      }, :progress_proc => lambda { |s|
+        pbar.set s if pbar
+      }) { |f| @file.write f.read }
+    end
+
     def get_format
-      @format = case File.extname @url
+      @format = case File.extname @filename
       when '.zip' then :zip
       when '.tar' then :tar
       when '.tgz' then :tgz
@@ -118,16 +152,23 @@ module Geoffrey
       end
     end
 
+    def get_filename
+      @filename   = @options[:filename]
+      @filename ||= begin
+        escape_whitespaces(File.basename(@url).split("?").first) if @url && @url != ""
+      end
+    end
+
     # Actual decompressing of the file. Does so into a directory we created in
     # +#{Dir.tmpdir}/#{filename}+
     #--
-    # 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
+      debug "decompressing #{file.path}"
+      case format
       when :zip
         execute "unzip -o #{file.path} -d #{dir}", :sudo => false
       when :tar
@@ -144,21 +185,41 @@ module Geoffrey
 
       # Might be that the decompression failed
       raise DecompressionError unless $?.success?
+
+      debug "Files after decompression:"
+      debug `ls -la #{dir}`
     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)
       if $?.success?
         info    = str.split("\t")
-        dmg_dir = info.last.chomp
+
+        dmg_dir = escape_whitespaces(info.last.chomp)
+        debug "the dmg has been mounted here: #{dmg_dir}"
+
         device  = info.first.strip.split("/").last
-        execute("cp -r #{dmg_dir}/** #{dir}")
+        debug "the attached device is: #{device}"
+
+        debug "These are the files inside the dmg:"
+        debug `ls -la #{dmg_dir}`
+
+        execute("cp -r #{escape_whitespaces(dmg_dir)}/** #{dir}")
+
+        debug "Now these in the target"
+        debug `ls -la #{dir}`
+
         execute("hdiutil detach #{device}")
         execute("rm -f #{dir}.dmg")
       end
     end
 
+    def escape_whitespaces(path)
+      path.gsub(' ','\ ')
+    end
   end
 end

data/lib/geoffrey/plist.rb

@@ -10,7 +10,11 @@ module Geoffrey
       :terminal => "#{ENV["HOME"]}/Library/Preferences/com.apple.Terminal.plist"
     }
 
-    attr_accessor :data, :file, :process
+    attr_accessor :data, :file, :process, :changes
+
+    def initialize
+      @changes = {}
+    end
 
     # Set the file you'll edit. if you pass a symbol then it'll use the file
     # defined in the FILES hash.
@@ -30,7 +34,7 @@ module Geoffrey
     end
 
     def options
-      data
+      self
     end
 
     def [](key)
@@ -38,12 +42,12 @@ module Geoffrey
     end
 
     def []=(key,value)
+      old_value = data[key]
       data[key] = value
+      @changes[key] = value if old_value != value
     end
 
     # Saves the changes defined into the file.
-    #--
-    # TODO don't reopen the process if it wasn't opened to begin with
     def save
       kill
       data.save
@@ -53,11 +57,21 @@ module Geoffrey
   private
 
     def kill
-      system "killall '#{@process}'" unless @process.nil?
+      unless @process.nil? || @changes.keys.size.zero?
+        `ps aux | grep #{@process}`.split("\n").each do |row|
+          unless row.include?("grep #{@process}")
+            columns = row.split(" ")
+            @pid = columns[1].to_i
+            Process.kill("TERM", @pid) rescue nil
+          end
+        end
+      end
     end
 
     def open
-      system "open '#{@process}'" unless @process.nil?
+      unless @process.nil? || @changes.keys.size.zero? || @pid.nil?
+        system "open '#{@process}'"
+      end
     end
 
   end

data/lib/geoffrey/reporter.rb

@@ -0,0 +1,42 @@
+require 'logger'
+
+#--
+# H4X!
+# Changing logger format, didn't like the other one
+class Logger
+  def format_message(level, time, progname, msg)
+    ">> #{msg}\n"
+  end
+end
+# /H4X
+
+module Geoffrey
+
+  # This module is intended to be used in real action classes so that they can
+  # report what they're doing. The idea is to abstract the functionality in
+  # order to test it better and help the future children.
+  module Reporter
+
+    def logger
+      unless @logger
+        @logger = Logger.new($stdout)
+        @logger.level = Logger::INFO
+      end
+      @logger
+    end
+
+    def echo(msg)
+      logger.info msg
+    end
+
+    def debug(msg)
+      logger.debug msg
+    end
+
+    def verbose(mode)
+      @logger = Logger.new($stdout)
+      @logger.level = (mode ? Logger::DEBUG : Logger::INFO)
+    end
+
+  end
+end

data/lib/geoffrey/version.rb

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

data/spec/cli_spec.rb

@@ -0,0 +1,67 @@
+require 'spec_helper'
+
+require 'geoffrey/cli'
+
+describe Geoffrey::CLI do
+
+  before(:each) do
+    @app = Geoffrey::CLI.new
+    @app.stubs(:templates_dir).returns(File.dirname(__FILE__) + '/templates')
+  end
+
+  context 'list' do
+
+    it "prints a list of templates" do
+      output = capturing_output { @app.list }
+      output.should include("simbl")
+      output.should include("growl")
+    end
+
+    it "filters through items in the list" do
+      output = capturing_output { @app.list("gr") }
+      output.should     include("growl")
+      output.should_not include("simbl")
+    end
+
+    it "filters through items in the list ignoring case" do
+      output = capturing_output { @app.list("Growl") }
+      output.should     include("growl")
+      output.should_not include("simbl")
+    end
+
+  end
+
+  context 'install' 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.
+    it "knows what to install" do
+      Geoffrey::Package.any_instance.expects(:url).with("http://some.fic/tional/url.dmg").once
+      Geoffrey::Package.any_instance.expects(:description).with("This package should do awesome stuff").once
+      Geoffrey::Package.any_instance.expects(:options).with(:sudo => true).once.returns(nil)
+      Geoffrey::Package.any_instance.expects(:download_and_decompress).once.returns(nil)
+      Geoffrey::Package.any_instance.expects(:install).once
+      @app.install("growl")
+    end
+
+  end
+
+  #--
+  # This doesn't really have to be tested, right? It's not public api, we
+  # should test the public methods that depend on these. Or not?
+  context 'finding templates' do
+
+    it "knows about template files" do
+      @app.send(:list_of_template_names).should == ['growl','simbl']
+      @app.send(:list_of_templates).each do |file|
+        File.exists?(file).should be_true
+      end
+    end
+
+    it "knows how to find the file a template is defined it" do
+      @app.send(:file_for_template,'growl').should == File.dirname(__FILE__) + '/templates/growl.rb'
+    end
+
+  end
+
+end

data/spec/geoffrey_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+require 'geoffrey'
+
+describe "Geoffrey" do
+
+  context "environment" do
+
+    it "has an environment attribute" do
+      Geoffrey.should respond_to(:"environment=")
+      Geoffrey.should respond_to(:"environment")
+    end
+
+  end
+
+end

data/spec/package_spec.rb

@@ -3,10 +3,18 @@ require 'geoffrey/package'
 
 describe Geoffrey::Package do
 
-  it "allows for the url to be specified" do
+  it "receives different options" do
+    [:url, :name, :description, :options].each do |opt|
+      package = Geoffrey::Package.new
+      package.send(opt, 'foo')
+      package.send(opt).should == 'foo'
+    end
+  end
+
+  it "allows for a description to be specified" do
     package = Geoffrey::Package.new
-    package.url 'http://localhost/crappy.zip'
-    package.url.should == 'http://localhost/crappy.zip'
+    package.description 'foo'
+    package.description.should == 'foo'
   end
 
   it "allows for some options to be specified" do
@@ -33,19 +41,23 @@ describe Geoffrey::Package 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
+      capturing_output 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
     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
+      capturing_output 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
 
   end
@@ -55,9 +67,11 @@ describe Geoffrey::Package do
   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)
+      capturing_output do
+        package = Geoffrey::Package.new
+        package.url 'really/impossible/to/exist.dmg'
+        lambda { package.download_and_decompress }.should raise_exception(Geoffrey::NotFoundError)
+      end
     end
 
     it "raises an error if the file has bad format" do
@@ -75,6 +89,13 @@ describe Geoffrey::Package do
       File.read(package.file_to_install).chomp.should == "foo"
     end
 
+    it "removes dirty from url's (but only from http/ftp" do
+      package = Geoffrey::Package.new
+      package.url(File.dirname(__FILE__) + "/static/test.txt?foo=bar&baz=jar")
+      package.send(:get_filename)
+      package.filename.should == "test.txt"
+    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")
@@ -96,9 +117,25 @@ describe Geoffrey::Package do
       File.read(package.file_to_install).chomp.should == "foo"
     end
 
+    # 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.dmg")
+      package.url(File.dirname(__FILE__) + "/static/test 1.dmg")
+      package.download_and_decompress
+      File.read(package.file_to_install).chomp.should == "foo"
+    end
+
+    # test.txt.gz.123 is test.txt.gz copied and renamed. This way geoffrey
+    # knows what file format to use.
+    # TODO maybe would be better to just set the strategy to use when
+    #   extracting
+    it "allows for filename to be configured" do
+      package = Geoffrey::Package.new
+      package.url(File.dirname(__FILE__) + "/static/test.txt.gz.123")
+      package.options :filename => 'test.txt.gz'
       package.download_and_decompress
       File.read(package.file_to_install).chomp.should == "foo"
     end

data/spec/plist_spec.rb

@@ -17,7 +17,7 @@ describe Geoffrey::Plist do
   it "also accepts symbol values for already known values" do
     plist = Geoffrey::Plist.new
     plist.file :terminal
-    plist.file.should include("com.apple.Terminal.plist") 
+    plist.file.should include("com.apple.Terminal.plist")
   end
 
   it "parses correct plist items" do
@@ -26,18 +26,16 @@ describe Geoffrey::Plist do
     plist.data.class.should == Plist4r::Plist
   end
 
-  it "knows that it has to close some appication before applying changes" do
+  it "doesn't restart applications if no changes where really made" do
     plist = Geoffrey::Plist.new
     plist.file(@plist_file.path)
     plist.affects "/some/process"
-
-    # Since I don't know how to test this without starting and shutting down processes
-    # I'll just suppose that some internal functions are called
-    plist.expects(:system).twice
+    plist.expects(:system).never
     plist.save
   end
 
   context "plist modification" do
+
     it "allows adding new plist item" do
       plist = Geoffrey::Plist.new
       plist.file(@plist_file.path)

data/spec/reporter_spec.rb

@@ -0,0 +1,79 @@
+require 'spec_helper'
+
+require 'geoffrey'
+
+
+class Foo
+  include Geoffrey::Reporter
+end
+
+describe Geoffrey::Reporter do
+
+  it "gives classes the ability to echo" do
+    foo = Foo.new
+    capturing_output { foo.echo "Hola" }.should include("Hola")
+  end
+
+  it "gives classes the ability to print debug information" do
+    foo = Foo.new
+    capturing_output { foo.debug "useful" }.should_not include("useful")
+    capturing_output { foo.verbose(true); foo.debug "useful" }.should include("useful")
+    capturing_output { foo.verbose(false); foo.debug "useful" }.should_not include("useful")
+  end
+
+end
+
+describe Geoffrey::Package do
+
+  before(:each) do
+    @package = Geoffrey::Package.new
+  end
+
+  it "prints proper error when no url specified" do
+    capturing_output { @package.download_and_decompress }.should include("URL not specified")
+  end
+
+  it "prints proper error when file can't be downloaded for some reason" do
+    capturing_output do
+      @package.url("/nothing/to/see/here.txt")
+      lambda { @package.download_and_decompress }.should raise_error
+    end.should include("Can't find file /nothing/to/see/here.txt")
+  end
+
+  it "prints the description when given" do
+    capturing_output do
+      @package.url(File.dirname(__FILE__) + "/static/test.txt")
+      @package.description 'Something useful'
+      @package.download_and_decompress
+    end.should include("Something useful")
+  end
+
+  it "prints proper message when the conditions don't apply" do
+    capturing_output do
+      @package.url(File.dirname(__FILE__) + "/static/test.txt")
+      @package.options :if => Proc.new { false }
+      @package.download_and_decompress
+    end.strip.should include("test.txt is already installed.")
+  end
+
+end
+
+describe Geoffrey::Plist do
+
+  it "prints proper error when file is not found or has bad format" do
+    pending
+  end
+
+  it "prints amount of changes done" do
+    pending
+  end
+
+  it "prints nothing if no values where changed" do
+    pending
+  end
+
+  it "prints information about process being restarted" do
+    pending
+  end
+
+end

data/spec/spec_helper.rb

@@ -1,8 +1,11 @@
-require 'bundler'
-Bundler.setup(:default,:test)
-require 'geoffrey'
 require 'tempfile'
+require 'stringio'
+require 'geoffrey'
+require 'support/helpers'
+
+Geoffrey.environment = :test
 
 Spec::Runner.configure do |config|
   config.mock_with :mocha
+  config.include Helpers
 end

data/spec/support/helpers.rb

@@ -0,0 +1,17 @@
+module Helpers
+
+  # Small helper to capture output oft hings happening inside a block
+  # @example
+  #  out = capturing_output do
+  #    puts "Hello!"
+  #  end
+  #  out # => "Hello\n"
+  def capturing_output(&block)
+    $stdout = StringIO.new
+    yield
+    out = $stdout.string
+    $stdout = STDOUT
+    return out
+  end
+
+end

data/spec/templates/growl.rb

@@ -0,0 +1,3 @@
+url 'http://some.fic/tional/url.dmg'
+description "This package should do awesome stuff"
+options :sudo => true

data/templates/adium.rb

@@ -0,0 +1,4 @@
+name 'Adium'
+description "Adium is a free instant messaging application for Mac OS X that can connect to AIM, MSN, Jabber, Yahoo, and more."
+url 'http://adiumx.cachefly.net/Adium_1.3.10.dmg'
+options :unless => Proc.new { File.exists?("/Applications/Adium.app") }

data/templates/growl.rb

@@ -0,0 +1,4 @@
+name "Growl"
+description "Growl lets Mac OS X applications unintrusively tell you when things happen."
+url 'http://growl.cachefly.net/Growl-1.2.1.dmg'
+options :sudo => true, :unless => Proc.new { File.exists?("/Library/PreferencePanes/Growl.prefPane") }

data/templates/skype.rb

@@ -0,0 +1,4 @@
+name "Skype"
+description "Call landlines and mobiles worldwide"
+url 'http://www.skype.com/go/getskype-macosx.dmg'
+options :unless => Proc.new { File.exists?("/Applications/Skype.app") }

data/templates/unrarx.rb

@@ -0,0 +1,4 @@
+name "UnRarX"
+description "UnRarX - Mac OS X RAR Extraction Utility"
+url 'http://www.unrarx.com/files/UnRarX_2.2.zip'
+options :unless => Proc.new { File.exists?("/Applications/UnRarX.app") }

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: geoffrey
 version: !ruby/object:Gem::Version 
-  hash: 19
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 6
-  version: 0.0.6
+  version: 0.1.0
 platform: ruby
 authors: 
 - Albert Llop
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-31 00:00:00 +02:00
+date: 2010-09-10 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15424063
         segments: 
         - 1
         - 0
@@ -44,7 +42,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
         segments: 
         - 1
         - 3
@@ -53,72 +50,107 @@ dependencies:
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: mocha
+  name: autotest
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 43
         segments: 
         - 0
         - 9
         - 8
         version: 0.9.8
   type: :development
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: yard
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 0
         - 6
         - 0
         version: 0.6.0
   type: :development
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: bluecloth
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
         segments: 
         - 2
         - 0
         - 7
         version: 2.0.7
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: plist4r
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: progressbar
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: thor
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id009
 description: Geoffrey is a little helper to aid in the installation of packages and configuration of various Mac OSX applications.
 email: 
 - mrsimo@gmail.com
-executables: []
-
+executables: 
+- geoffrey
 extensions: []
 
 extra_rdoc_files: []
@@ -129,17 +161,23 @@ files:
 - Gemfile.lock
 - README.md
 - Rakefile
+- bin/geoffrey
 - geoffrey.gemspec
 - lib/geoffrey.rb
+- lib/geoffrey/cli.rb
 - lib/geoffrey/package.rb
 - lib/geoffrey/plist.rb
+- lib/geoffrey/reporter.rb
 - lib/geoffrey/version.rb
+- spec/cli_spec.rb
+- spec/geoffrey_spec.rb
 - spec/package_spec.rb
 - spec/plist_spec.rb
+- spec/reporter_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/static/example.plist
-- spec/static/test.dmg
+- spec/static/test 1.dmg
 - spec/static/test.error.dmg
 - spec/static/test.error.gz
 - spec/static/test.error.tar.gz
@@ -148,7 +186,15 @@ files:
 - spec/static/test.tgz
 - spec/static/test.txt
 - spec/static/test.txt.gz
+- spec/static/test.txt.gz.123
 - spec/static/test.txt.zip
+- spec/support/helpers.rb
+- spec/templates/growl.rb
+- spec/templates/simbl.rb
+- templates/adium.rb
+- templates/growl.rb
+- templates/skype.rb
+- templates/unrarx.rb
 has_rdoc: true
 homepage: 
 licenses: []
@@ -163,7 +209,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -172,7 +217,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 23
       segments: 
       - 1
       - 3