brewdler 0.2.1 → 0.3.0

data/CONTRIBUTING.md

@@ -0,0 +1,9 @@
+## Contributing
+* Fork the project.
+* Make your feature addition or bug fix.
+* Add tests for it. This is important so I don't break it in a
+  future version unintentionally.
+* Add documentation if necessary.
+* Commit, do not mess with rakefile, version, or history.
+  (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
+* Send a pull request. Bonus points for topic branches.

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012 Andrew Nesbitt
+Copyright (c) 2013 Andrew Nesbitt
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Readme.mdown

@@ -2,6 +2,10 @@
 
 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)
+
 ## Requirements
 
 [Homebrew](http://github.com/mxcl/homebrew) is used for installing the dependencies, it only works on a mac and so does this gem.
@@ -53,4 +57,4 @@ Report Issues/Feature requests on [GitHub Issues](http://github.com/andrew/brewd
 
 ## Copyright
 
-Copyright (c) 2011 Andrew Nesbitt. See LICENSE for details.
+Copyright (c) 2013 Andrew Nesbitt. See LICENSE for details.

data/bin/brewdle

@@ -13,21 +13,21 @@ command :install do |c|
   c.action do |args, options|
 
     begin
-      dependencies = []
-      File.open(File.join(Dir.pwd, 'Brewfile')).each { |line|
+      dependencies = File.open(File.join(Dir.pwd, 'Brewfile')).find_all { |line|
         line.chomp!
-        if line.length > 0 && !comment?(line)
-          dependencies << line
-        end
+        line.length > 0 && !comment?(line)
       }
     rescue
       puts 'No Brewfile found'
     end
 
     dependencies.each do |dependency|
-      installed_version = installed?(dependency)
-      puts "#{installed_version ? 'Using' : 'Installing'}: #{dependency} #{installed_version}"
-      install(dependency) unless installed_version
+      if installed?(dependency)
+        puts "Using #{dependency} (#{installed_version(dependency)})"
+      else
+        puts "Installing #{dependency} (#{formula_version(dependency)})"
+        install(dependency)
+      end
     end
 
     puts "All dependencies installed"
@@ -44,10 +44,18 @@ def install(name)
 end
 
 def installed?(name)
-  installed = `brew list #{name} -v`
-  if installed.length > 0 && !installed.match(/\AError/)
-    return installed.split(' ').last
-  end
+  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)

data/lib/brewdler/version.rb

@@ -1,3 +1,3 @@
 module Brewdler
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brewdler
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-30 00:00:00.000000000 Z
+date: 2013-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
-  requirement: &70125840636540 !ruby/object:Gem::Requirement
+  requirement: &70267521127940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70125840636540
+  version_requirements: *70267521127940
 description: 
 email:
 - andrewnez@gmail.com
@@ -31,6 +31,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- CONTRIBUTING.md
 - Gemfile
 - LICENSE
 - Rakefile
@@ -64,3 +65,4 @@ signing_key:
 specification_version: 3
 summary: Bundler for non-ruby dependencies from homebrew
 test_files: []
+has_rdoc: