brewdler 0.3.1 → 0.4.0

data/.gitignore

@@ -15,3 +15,5 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.ruby-gemset
+.ruby-version

data/Readme.mdown

@@ -4,12 +4,14 @@ Bundler for non-ruby dependencies from homebrew
 
 [![Gem Version](https://badge.fury.io/rb/brewdler.png)](http://badge.fury.io/rb/brewdler)
 [![Dependency Status](https://gemnasium.com/andrew/brewdler.png)](https://gemnasium.com/andrew/brewdler)
-[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/andrew/brewdler)
+[![Code Climate](https://codeclimate.com/github/andrew/brewdler.png)](https://codeclimate.com/github/andrew/brewdler)
 
 ## Requirements
 
 [Homebrew](http://github.com/mxcl/homebrew) is used for installing the dependencies, it only works on a mac and so does this gem.
 
+[Homebrew-cask](http://github.com/phinze/homebrew-cask) is optional and used for installing Mac applications.
+
 ## Usage
 
 Install using rubygems:
@@ -22,11 +24,12 @@ then create a `Brewfile` in the root of your project:
 
 Then list your homebrew based dependencies in your `Brewfile`:
 
-    redis
-    mongodb
-    sphinx
-    imagemagick
-    mysql
+    brew 'redis'
+    brew 'mongodb'
+    brew 'sphinx'
+    brew 'imagemagick'
+    brew 'mysql'
+    cask 'google-chrome'
 
 You can then easily install all of the dependencies on a new mac like so:
 
@@ -57,4 +60,4 @@ Report Issues/Feature requests on [GitHub Issues](http://github.com/andrew/brewd
 
 ## Copyright
 
-Copyright (c) 2013 Andrew Nesbitt. See LICENSE for details.
+Copyright (c) 2013 Andrew Nesbitt. See LICENSE for details.

data/bin/brewdle

@@ -11,67 +11,18 @@ default_command :install
 command :install do |c|
   c.description = 'Install all homebrew based dependecies'
   c.action do |args, options|
-
     begin
-      dependencies = File.open(File.join(Dir.pwd, 'Brewfile')).find_all { |line|
-        line.chomp!
-        line.length > 0 && !comment?(line)
-      }
-    rescue
+      file = File.read(File.join(Dir.pwd, "Brewfile"))
+      Brewdler::Dsl.new(file).process
+    rescue Errno::ENOENT => e
       puts 'No Brewfile found'
-    end
-
-    missing_formulae = dependencies.find_all { |dependency|
-      !formula_exists?(dependency)
-    }
-
-    if missing_formulae.empty?
-      dependencies.each do |dependency|
-        if installed?(dependency)
-          puts "Using #{dependency} (#{installed_version(dependency)})"
-        else
-          puts "Installing #{dependency} (#{formula_version(dependency)})"
-          install(dependency)
-        end
+      puts e.message
+    rescue NameError
+      file = File.open(File.join(Dir.pwd, "Brewfile"))
+      file.find_all do |name|
+        name.chomp!
+        Brewdler::BrewInstaller.install(name) if name.length > 0 && name !~ /^ *#/
       end
-      puts "All dependencies installed"
-    else
-      puts "Non-existent formula/e: #{missing_formulae.join(', ')}"
-      puts "(please check spelling in Brewfile, and/or run 'brew update')"
     end
-
   end
 end
-
-def install(name)
-  brewable = `brew info #{name}`
-  if brewable[0..4] != 'Error'
-    system "brew install #{name}"
-  else
-    puts "Error: No available formula for #{name}"
-  end
-end
-
-def formula_exists?(name)
-  formula_location = File.join(`brew --prefix`.chomp, 'Library', 'Formula', name + ".rb")
-  File.exists? formula_location
-end
-
-def installed?(name)
-  installed_version = `brew list --versions #{name}`.chomp
-  !installed_version.empty?
-end
-
-def installed_version(name)
-  installed_version = `brew list --versions #{name}`.chomp
-  installed_version.match(/#{name} ([^\s]+)/)[1]
-end
-
-def formula_version(name)
-  formula_version = `brew info #{name}`
-  formula_version.split($/).first.match(/#{name}: stable ([^\s,]+)/)[1]
-end
-
-def comment?(line)
-  line =~ /^ *#/
-end

data/brewdler.gemspec

@@ -2,8 +2,8 @@
 require File.expand_path('../lib/brewdler/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["Andrew Nesbitt"]
-  gem.email         = ["andrewnez@gmail.com"]
+  gem.authors       = ["Andrew Nesbitt", "James A. Anderson", "Amos King"]
+  gem.email         = ["andrewnez@gmail.com", "me@jamesaanderson.com", "amos.l.king@gmail.com"]
   gem.summary       = %q{Bundler for non-ruby dependencies from homebrew}
 
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }

data/lib/brewdler.rb

@@ -1 +1,4 @@
-require "brewdler/version"
+require "brewdler/version"
+require "brewdler/dsl"
+require "brewdler/brew_installer"
+require "brewdler/cask_installer"

data/lib/brewdler/brew_installer.rb

@@ -0,0 +1,7 @@
+module Brewdler
+  class BrewInstaller
+    def self.install(name)
+      `brew install #{name}`
+    end
+  end
+end

data/lib/brewdler/cask_installer.rb

@@ -0,0 +1,7 @@
+module Brewdler
+  class CaskInstaller
+    def self.install(name)
+      `brew cask install #{name}`
+    end
+  end
+end

data/lib/brewdler/dsl.rb

@@ -0,0 +1,19 @@
+module Brewdler
+  class Dsl
+    def initialize(input)
+      @input = input
+    end
+
+    def process
+      instance_eval(@input)
+    end
+
+    def brew(name)
+      Brewdler::BrewInstaller.install(name)
+    end
+
+    def cask(name)
+      Brewdler::CaskInstaller.install(name)
+    end
+  end
+end

data/lib/brewdler/version.rb

@@ -1,3 +1,3 @@
 module Brewdler
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,19 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: brewdler
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
 - Andrew Nesbitt
+- James A. Anderson
+- Amos King
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-11 00:00:00.000000000 Z
+date: 2013-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
-  requirement: &70296410699500 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +23,17 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70296410699500
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - andrewnez@gmail.com
+- me@jamesaanderson.com
+- amos.l.king@gmail.com
 executables:
 - brewdle
 extensions: []
@@ -39,6 +48,9 @@ files:
 - bin/brewdle
 - brewdler.gemspec
 - lib/brewdler.rb
+- lib/brewdler/brew_installer.rb
+- lib/brewdler/cask_installer.rb
+- lib/brewdler/dsl.rb
 - lib/brewdler/version.rb
 homepage: 
 licenses: []
@@ -60,9 +72,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Bundler for non-ruby dependencies from homebrew
 test_files: []
-has_rdoc: