dmg 0.0.3 → 0.0.4

data/Gemfile

@@ -1,4 +1,4 @@
 source "http://rubygems.org"
 
-# Specify your gem's dependencies in dmg.gemspec
+# Specify your gem's dependencies in jekyll-s3.gemspec
 gemspec

data/dmg.gemspec

@@ -8,12 +8,16 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Philippe Creux"]
   s.email       = ["pcreux@gmail.com"]
-  s.homepage    = ""
+  s.homepage    = "https://github.com/versapay/dmg"
   s.summary     = %q{Install popular applications provided as dmgs from the command line}
   s.description = %q{It's like apt-get for Mac}
 
   s.default_executable = %q{dmg}
 
+  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'cucumber'
+  s.add_development_dependency 'aruba'
+
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }

data/features/dmg.feature

@@ -0,0 +1,14 @@
+Feature: dmg
+
+  In order to install dmgs via the command line
+  As a Mac user
+  I want to type dmg install chrome and it should just work!
+
+  Scenario: Run dmg for the first time
+    When I run "dmg list"
+    Then the output should contain "chrome"
+    Then the file ".dmg/sources.yml" should contain:
+      """
+      - https://github.com/pcreux/dmg-pkgs/raw/master/pkgs.yml
+      """
+

data/features/support/env.rb

@@ -0,0 +1,23 @@
+require 'rubygems'
+require 'bundler'
+
+Bundler.require
+
+require 'aruba/cucumber'
+
+# Following from 'aruba/cucumber'
+Before do
+  @__aruba_original_paths = (ENV['PATH'] || '').split(File::PATH_SEPARATOR)
+  ENV['PATH'] = ([File.expand_path('bin')] + @__aruba_original_paths).join(File::PATH_SEPARATOR)
+  ENV['DMG_HOME'] = File.join(File.dirname(__FILE__), '..', '..', 'tmp', 'aruba')
+end
+
+After do
+  ENV['PATH'] = @__aruba_original_paths.join(File::PATH_SEPARATOR)
+end
+# End of following from 'aruba/cucumber'
+
+Then /^the file "([^"]*)" should contain:$/ do |file, exact_content|
+  check_file_content(file, exact_content, true)
+end
+

data/lib/dmg.rb

@@ -1,7 +1,51 @@
-module DMG; end
-
 require 'yaml'
 
-%w{errors pkg cli}.each do |file|
+module DMG
+  extend self
+
+  def home_dir
+    ENV['DMG_HOME'] || ENV['HOME']
+  end
+
+  def config_dir
+    File.join(home_dir, '.dmg')
+  end
+
+  def sources_file
+    File.join(config_dir, 'sources.yml')
+  end
+
+  def combined_pkgs_file
+    File.join(config_dir, 'pkgs.yml')
+  end
+
+  def default_configuration
+    ['https://github.com/pcreux/dmg-pkgs/raw/master/pkgs.yml']
+  end
+
+  def setup!
+    create_dmg_directory_if_needed
+    generate_default_source_file_if_needed
+    download_sources
+  end
+
+  def create_dmg_directory_if_needed
+    unless File.directory?(config_dir)
+      Dir::mkdir(config_dir)
+    end
+  end
+
+  def generate_default_source_file_if_needed
+    unless File.exists? sources_file
+      File.open(sources_file, 'w') { |f| f.write default_configuration.to_yaml }
+    end
+  end
+
+  def download_sources
+    DMG::Source.download_and_combine
+  end
+end
+
+%w{errors output_helpers source pkg cli}.each do |file|
   require File.dirname(__FILE__) + "/dmg/#{file}"
 end

data/lib/dmg/cli.rb

@@ -1,16 +1,26 @@
 class DMG::CLI
-  def self.run!
-    case ARGV[0]
-    when "install"
-      DMG::Pkg.install(ARGV[1..-1])
-    when "list"
-      DMG::Pkg.list
-    else
-      puts <<-EOF
-Usage: 
-  dmg install PACKAGE
-  dmg list
-EOF
+  class << self
+    include OutputHelpers
+
+    def run!
+
+      DMG.setup!
+
+      case ARGV[0]
+      when "install"
+        DMG::Pkg.install(ARGV[1..-1])
+      when "list"
+        puts DMG::Pkg.list
+      else
+        puts <<-EOF
+  Usage: 
+    dmg install PACKAGE
+    dmg list
+  EOF
+      end
+
+    rescue DMG::DMGError => e
+      alert(e.message)
     end
   end
 end

data/lib/dmg/output_helpers.rb

@@ -0,0 +1,54 @@
+module OutputHelpers
+  def info(text)
+    puts Output.green(text)
+  end
+
+  def debug(text)
+    puts Output.grey(text)
+  end
+
+  def alert(text)
+    puts Output.red(text)
+  end
+
+  module Output
+
+    extend self
+
+    def color(text, color_code)
+      "#{color_code}#{text}\e[0m"
+    end 
+
+    def bold(text)
+      color(text, "\e[1m")
+    end 
+
+    def white(text)
+      color(text, "\e[37m")
+    end 
+
+    def green(text)
+      color(text, "\e[32m")
+    end 
+
+    def red(text)
+      color(text, "\e[31m")
+    end 
+
+    def magenta(text)
+      color(text, "\e[35m")
+    end 
+
+    def yellow(text)
+      color(text, "\e[33m")
+    end 
+
+    def blue(text)
+      color(text, "\e[34m")
+    end 
+
+    def grey(text)
+      color(text, "\e[90m")
+    end 
+  end
+end

data/lib/dmg/pkg.rb

@@ -1,7 +1,7 @@
 module DMG
   class Pkg
     def self.list
-      puts all.map(&:name)
+      all.map(&:name).sort
     end
 
     def self.install(pkg_names)
@@ -9,53 +9,98 @@ module DMG
       pkgs.each(&:install!)
     end
 
-    def self.all
-      return @@all if defined?(@@all)
-      @@all = []
-      pkgs = YAML.load_file(File.dirname(__FILE__) + '/pkgs.yml')
-      pkgs.each do |key, values|
-        @@all << Pkg.new({'name' => key}.merge(values))
-      end
+    def self.find!(pkg_name)
+      pkg = all.select { |pkg| pkg.name == pkg_name }.first
+      raise PackageNotFound, "Can't find a package called '#{pkg_name}'" unless pkg
 
-      @@all
+      pkg
     end
 
-    attr_reader :name, :package, :url, :volume_dir
+    attr_reader :name, :package, :url, :volume_dir, :mpkg
 
     def initialize(args)
       @name = args['name']
       @package = args['package']
       @url = args['url']
       @volume_dir = args['volume_dir'] || @package
+      @mpkg = args['mpkg']
+    end
+
+    protected
+
+    def self.all
+      return @@all if defined?(@@all)
+      @@all = []
+      hash_from_yaml.each do |key, values|
+        @@all << Pkg.new({'name' => key}.merge(values))
+      end
+
+      @@all
+    end
+
+    def self.hash_from_yaml
+      YAML.load_file(File.dirname(__FILE__) + '/pkgs.yml')
     end
 
+    include OutputHelpers
+
     def install!
-      dmg_file = "#{ENV['HOME']}/Downloads/#{package}.dmg"
-      destination = '/Applications'
+      if downloaded?
+        info "#{name} already downloaded in #{dmg_file}"
+      else
+        download
+      end
 
-      if "hdiutil info"[/image-path.*#{dmg_file}/]
-        puts "#{name} is already installed"
-        return
+      mount unless mounted?
+      if mpkg
+        open_mpkg
+        info "I've just launched #{name} installer!"
+        info ""
+        info "Don't forget to unmount the volume once done. Just run the following command:"
+        info "  hdiutil detach '/Volumes/#{volume_dir}'"
+        info ""
+      else
+        copy_app
+        info "#{name} is now installed!"
       end
+    end
+
+    def dmg_file
+      "#{ENV['HOME']}/Downloads/#{package}.dmg"
+    end
+
+    def destination
+      '/Applications'
+    end
+
+    def mounted?
+      !!`hdiutil info`[/image-path.*#{dmg_file}/]
+    end
+
+    def download
+      run_cmd "curl -L #{url} -o '#{dmg_file}'"
+    end
 
-      run_cmd "curl -L #{url} -o '#{dmg_file}'" unless File.exist?(dmg_file)
+    def mount
       run_cmd "hdid '#{dmg_file}'"
+    end
+
+    def open_mpkg
+      run_cmd "open /Volumes/#{volume_dir}/#{mpkg}.mpkg"
+    end
+
+    def copy_app
       run_cmd "sudo cp -fr '/Volumes/#{volume_dir}/#{package}.app' '#{destination}'"
       run_cmd "hdiutil detach '/Volumes/#{volume_dir}'"
       run_cmd "sudo chmod 755 '#{destination}/#{package}.app/Contents/MacOS/#{package}'"
     end
 
-    protected
-
-    def self.find!(pkg_name)
-      pkg = all.select { |pkg| pkg.name == pkg_name }.first
-      raise PackageNotFound, "Can't find a package called '#{pkg_name}'" unless pkg
-
-      pkg
+    def downloaded?
+      File.exist?(dmg_file)
     end
 
     def run_cmd(cmd)
-      puts cmd
+      debug cmd
       raise DMGError, "Failed to run a command" unless system(cmd)
     end
   end

data/lib/dmg/pkgs.yml

@@ -1,7 +1,8 @@
-dropbox:
-  package: Dropbox
-  volume_dir: Dropbox Installer
-  url: "http://www.dropbox.com/download?plat=mac"
+#  Does not work because of a broken symlink in the dmg
+#dropbox:
+#  package: Dropbox
+#  volume_dir: Dropbox Installer
+#  url: "http://www.dropbox.com/download?plat=mac"
 
 chrome:
   package: Google Chrome
@@ -11,25 +12,16 @@ skype:
   package: Skype
   url: http://www.skype.com/go/getskype-macosx.dmg
 
-steam:
-  package: Steam
-  url: http://cdn.store.steampowered.com/public/client/installer/steam.dmg
-
-macirssi:
-  package: MacIrssi
-  url: http://www.sysctl.co.uk/projects/macirssi/downloads/MacIrssi-0.8.6.6.dmg
-
 picasa:
   package: Picasa
   volume_dir: Picasa 3.8.9
   url: http://dl.google.com/photos/picasamac38.dmg
 
-adium:
-  package: Adium
-  volume_dir: Adium 1.4.1
-  url: http://download.adium.im/Adium_1.4.1.dmg
+virtualbox:
+  package: VirtualBox
+  url: http://download.virtualbox.org/virtualbox/4.0.4/VirtualBox-4.0.4-70112-OSX.dmg
+  mpkg: VirtualBox
 
-emacs:
-  package: Emacs
-  url: http://emacsformacosx.com/emacs-builds/Emacs-23.2-universal-10.6.3.dmg
-    
+launchbar:
+  package: LaunchBar
+  url: http://www.obdev.at/downloads/launchbar/LaunchBar-5.0.4.dmg

data/lib/dmg/source.rb

@@ -0,0 +1,66 @@
+require 'net/https'
+require 'uri'
+
+module DMG
+  class Source
+    class << self
+      def download_and_combine
+        combine(Source.all)
+      end
+
+      protected
+
+      def combine(sources)
+        combined_pkgs_hash = {}
+
+        sources.each do |source|
+          combined_pkgs_hash.merge!(source.pkgs_hash)
+        end
+
+        File.open(DMG::combined_pkgs_file, 'w') { |f| f.write(combined_pkgs_hash.to_yaml) }
+      end
+
+      def all
+        YAML.load_file(DMG::sources_file).map do |path_or_url|
+          Source.new(path_or_url)
+        end
+      end
+    end  # class << self
+
+    attr_reader :pkgs_hash
+
+    def initialize(path_or_url)
+      @pkgs_hash = YAML.load(get(path_or_url))
+    end
+
+    # Return content from path or url
+    def get(path_or_url)
+      case path_or_url
+      when /^http(s):\/\//
+        get_file(path_or_url)
+      else
+        read_file(path_or_url)
+      end
+    end
+
+    protected
+
+    # Get file content from a url
+    def get_file(url)
+      uri = URI.parse(url)
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = true if uri.port == 443
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        
+      request = Net::HTTP::Get.new(uri.request_uri)
+
+      response = http.request(request)
+      response.body
+    end
+
+    # Return file content from a path
+    def read_file(path)
+      File.read(path)
+    end
+  end
+end

data/lib/dmg/version.rb

@@ -1,3 +1,3 @@
 module Dmg
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/data/pkgs_1.yml

@@ -0,0 +1,22 @@
+#  Does not work because of a broken symlink in the dmg
+#dropbox:
+#  package: Dropbox
+#  volume_dir: Dropbox Installer
+#  url: "http://www.dropbox.com/download?plat=mac"
+
+chrome:
+  package: Google Chrome
+  url: "https://dl-ssl.google.com/chrome/mac/stable/GGRM/googlechrome.dmg"
+  
+skype:
+  package: Skype
+  url: http://www.skype.com/go/getskype-macosx.dmg
+
+picasa:
+  package: Picasa
+  volume_dir: Picasa 3.8.9
+  url: http://dl.google.com/photos/picasamac38.dmg
+
+launchbar:
+  package: LaunchBar
+  url: http://www.obdev.at/downloads/launchbar/LaunchBar-5.0.4.dmg

data/spec/data/pkgs_2.yml

@@ -0,0 +1,24 @@
+#  Does not work because of a broken symlink in the dmg
+#dropbox:
+#  package: Dropbox
+#  volume_dir: Dropbox Installer
+#  url: "http://www.dropbox.com/download?plat=mac"
+
+chrome:
+  package: Google Chrome
+  url: "https://dl-ssl.google.com/chrome/mac/stable/GGRM/googlechrome.dmg"
+  
+skype:
+  package: Skype
+  url: http://www.skype.com/go/getskype-macosx.dmg
+
+picasa:
+  package: Picasa
+  volume_dir: Picasa 3.8.9
+  url: http://dl.google.com/photos/picasamac38.dmg
+
+virtualbox:
+  package: VirtualBox
+  url: http://download.virtualbox.org/virtualbox/4.0.4/VirtualBox-4.0.4-70112-OSX.dmg
+  mpkg: VirtualBox
+

data/spec/lib/pkg_spec.rb

@@ -0,0 +1,106 @@
+require 'spec_helper'
+
+describe DMG::Pkg do
+  before do
+    DMG::Pkg.stub!(:hash_from_yaml) do
+      {
+       "launchbar"=> {"url"=>"http://example.com/launchbar.dmg", "package"=>"LaunchBar"},
+       "virtualbox"=> {"url"=> "http://example.com/virtualbox.dmg", "package"=>"VirtualBox", "mpkg"=>"VirtualBox"},
+       "picasa"=> {"url"=>"http://example.com/picasa.dmg", "package"=>"Picasa", "volume_dir"=>"Picasa 3.8.9"}
+      }
+    end
+
+    DMG::Pkg.stub!(:install!)
+  end
+
+  describe "##all" do
+    subject { DMG::Pkg.all }
+
+    it "should return an array of DMG::Pkg" do
+      subject.should have(3).items
+      subject.each do |pkg|
+        pkg.should be_a(DMG::Pkg)
+      end
+    end
+
+    describe "one of the packages" do
+      subject { DMG::Pkg.all.select { |p| p.name == "launchbar" }.first }
+      its(:name) { should == "launchbar" }
+      its(:url)  { should == "http://example.com/launchbar.dmg" }
+      its(:package) { should == "LaunchBar"}
+    end
+  end
+
+  describe "##list" do
+    subject { DMG::Pkg.list }
+
+    it "should return an array of packages names" do
+      subject.should be_an(Array)
+      subject.first.should be_a(String)
+      subject.sort.should == subject
+    end
+  end
+
+  describe "##install" do
+    let(:launchbar)  { DMG::Pkg.find!("launchbar")  }
+    let(:picasa)     { DMG::Pkg.find!("picasa")     }
+    let(:virtualbox) { DMG::Pkg.find!("virtualbox") }
+
+    context "all the packages passed in exist" do
+      it "should call install on the packages with a name matching the ones passed in" do
+        launchbar.should_receive :install!
+        picasa.should_receive :install!
+        virtualbox.should_not_receive :install!
+
+        DMG::Pkg.install(%w(launchbar picasa))
+      end
+    end
+
+    context "one of the package does not exist" do
+      it "should raise PackageNotFound" do
+        expect { DMG::Pkg.install(%w(launchbar coffeemaker)) }.should raise_error(DMG::PackageNotFound)
+      end
+
+      it "should not install any package" do
+        launchbar.should_not_receive :install!
+        DMG::Pkg.install(%w(launchbar coffeemaker)) rescue nil
+      end
+    end
+  end
+
+  describe "#initialize" do
+    context %{when passing in { "name" => "launchbar", "url" => "http://example.com/launchbar.dmg", "package" => "LaunchBar"} } do
+      subject { DMG::Pkg.new({ "name" => "launchbar", "url" => "http://example.com/launchbar.dmg", "package" => "LaunchBar"}) }
+
+      its(:name) { should == "launchbar" }
+      its(:package) { should == "LaunchBar" }
+      its(:url) { should == "http://example.com/launchbar.dmg" }
+      its(:volume_dir) { should == "LaunchBar" }
+      its(:mpkg) { should be_nil }
+    end
+
+    context %{when passing in { "package" => "LaunchBar", "volume_dir" => "LaunchBarDMG", "mpkg" => "install.mpkg"} } do
+      subject { DMG::Pkg.new({ "package" => "LaunchBar", "volume_dir" => "LaunchBarDMG", "mpkg" => "install.mpkg"}) }
+
+      its(:package) { should == "LaunchBar" }
+      its(:volume_dir) { should == "LaunchBarDMG" }
+      its(:mpkg) { should == "install.mpkg" }
+    end
+
+    context "when the name, package or url is missing" do
+      it "should raise an exception"
+    end
+  end
+
+  describe "#install! (protected)" do
+    # This method runs a bunch of system commands that can only be
+    # tested in integration tests only
+    # We should refactor it as it contains a few switches:
+    context "when dmg not installed yet"
+    context "when dmg already installed"
+    context "when dmg not downloaded yet"
+    context "when dmg already downloaded"
+    context "when dmg has a mpkg"
+    context "when dmg does not have a mpkg"
+  end
+end

data/spec/lib/sources_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+describe DMG::Source do
+
+  let(:pkgs_1_path) { File.join(File.dirname(__FILE__), '..', 'data', 'pkgs_1.yml') }
+  let(:pkgs_2_path) { File.join(File.dirname(__FILE__), '..', 'data', 'pkgs_2.yml') }
+  let(:pkgs_1_url) { 'https://github.com/versapay/dmg/raw/master/spec/data/pkgs_1.yml' }
+
+  describe "#initialize" do
+    context "when given a path to a yaml file" do
+      subject { DMG::Source.new(pkgs_1_path) }
+
+      its(:pkgs_hash) { should == YAML.load_file(pkgs_1_path) }
+    end
+
+    context "when given a url" do
+      subject { DMG::Source.new(pkgs_1_url) }
+
+      its(:pkgs_hash) { should == YAML.load_file(pkgs_1_path) }
+    end
+  end
+
+  describe "#download_and_combine" do
+    before do
+      File.open(DMG.sources_file, 'w') { |f| f.write [pkgs_1_path, pkgs_2_path].to_yaml }
+      DMG::Source.download_and_combine
+    end
+
+    describe "generated combined packages file" do
+      let(:combined_pkgs) { YAML.load_file(DMG.combined_pkgs_file) }
+
+      subject { combined_pkgs }
+
+      it { should include("launchbar") } # in pkgs_1.yml only
+      it { should include("virtualbox") } # in pkgs_2.yml only
+    end
+
+  end
+
+end

data/spec/spec_helper.rb

@@ -0,0 +1,16 @@
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+
+require "rubygems"
+require "bundler"
+Bundler.load
+
+require 'rspec'
+require 'dmg'
+
+Rspec.configure do |config|
+  config.mock_with :rspec
+end
+
+ENV['DMG_HOME'] = File.join(File.dirname(__FILE__), '..', 'tmp', 'aruba')
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dmg
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Philippe Creux
@@ -15,10 +15,51 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-06 00:00:00 -07:00
+date: 2011-05-02 00:00:00 -07:00
 default_executable: dmg
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: cucumber
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: aruba
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
 description: It's like apt-get for Mac
 email: 
 - pcreux@gmail.com
@@ -35,14 +76,23 @@ files:
 - Rakefile
 - bin/dmg
 - dmg.gemspec
+- features/dmg.feature
+- features/support/env.rb
 - lib/dmg.rb
 - lib/dmg/cli.rb
 - lib/dmg/errors.rb
+- lib/dmg/output_helpers.rb
 - lib/dmg/pkg.rb
 - lib/dmg/pkgs.yml
+- lib/dmg/source.rb
 - lib/dmg/version.rb
+- spec/data/pkgs_1.yml
+- spec/data/pkgs_2.yml
+- spec/lib/pkg_spec.rb
+- spec/lib/sources_spec.rb
+- spec/spec_helper.rb
 has_rdoc: true
-homepage: ""
+homepage: https://github.com/versapay/dmg
 licenses: []
 
 post_install_message: 
@@ -75,5 +125,11 @@ rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Install popular applications provided as dmgs from the command line
-test_files: []
-
+test_files: 
+- features/dmg.feature
+- features/support/env.rb
+- spec/data/pkgs_1.yml
+- spec/data/pkgs_2.yml
+- spec/lib/pkg_spec.rb
+- spec/lib/sources_spec.rb
+- spec/spec_helper.rb