grabass 0.2.0 → 0.3.0

data/bin/grabass

@@ -2,7 +2,7 @@
 
 require_relative '../lib/grabass'
 
-commands = ['install', 'help']
+commands = ['install', 'update', 'help']
 command = ARGV.shift if commands.include? ARGV[0]
 command ||= commands[0]
 
@@ -12,10 +12,17 @@ options[:quiet]   = (ARGV.delete '--quiet')    || (ARGV.delete '-q')
 options[:help]    = (ARGV.delete '--help')     || (ARGV.delete '-h')
 options[:version] = (ARGV.delete '--version')  || (ARGV.delete '-v')
 
-manifest = ARGV.shift if not ARGV[0].nil? and File.exists? ARGV[0]
-manifest = Grabass::AssetManifest.new manifest || 'assets.json'
+options[:force] = true if command == 'update'
 
-destinations = ARGV
+manifest = (ARGV.shift if not ARGV[0].nil? and File.exists? ARGV[0]) || 'assets.json'
+
+options[:query] = ARGV.map do |arg|
+  Regexp.new(".*#{arg}.*", Regexp::IGNORECASE) || /.*/
+end
+
+options[:query] = [/.*/] if options[:query].length == 0
+
+manifest = Grabass::AssetManifest.new manifest
 
 unless options[:quiet]
   started = Time.now
@@ -23,16 +30,11 @@ end
 
 case command
 when 'help'
-  puts 'Help!'
-when 'install'
-  if destinations.length == 0
-    # Grab entire manifest
-    results = manifest.install options
-  else
-    # Grab the given destinations
-    puts 'TODO: Install specific destinations from the command line'
-    exit
-  end
+  puts 'Try `grabass assets.json`.'
+
+when 'install', 'update'
+  # Grab entire manifest
+  results = manifest.install options
 end
 
 unless options[:quiet] or results.nil?

data/lib/grabass.rb

@@ -15,6 +15,8 @@ class Grabass
   end
 
   class Source
+    attr_accessor :location
+
     def initialize(location)
       @location = location
 
@@ -87,7 +89,7 @@ class Grabass
     end
 
     def clone_git_repo(options = {})
-      puts Grabass::indent "Temporarily cloning #{@location}" unless options[:quiet]
+      puts "Temporarily cloning #{@location}" unless options[:quiet]
       `git clone --quiet #{@location} #{temp_dir}`
     end
 
@@ -158,6 +160,8 @@ class Grabass
   end
 
   class Asset
+    attr_accessor :source
+
     def initialize(source, selections)
       @source = Source.new(source)
 
@@ -190,6 +194,7 @@ class Grabass
   end
 
   class Comment
+    attr_accessor :content
     def initialize(content)
       @content = content
     end
@@ -230,12 +235,24 @@ class Grabass
       results = {:pass => 0, :fail => 0}
 
       @assets.each do |asset|
+        match = true
         if asset.is_a? Comment
-          asset.display options
+          match = options[:query].any? do |query|
+            asset.content =~ query
+          end
+
+          asset.display options if match
         elsif asset.is_a? Asset
-          asset_results = asset.install options
-          results[:pass] += asset_results[:pass]
-          results[:fail] += asset_results[:fail]
+          match = options[:query].any? do |query|
+            asset.source.location =~ query
+          end
+
+          if match
+            puts asset.source.location
+            asset_results = asset.install options
+            results[:pass] += asset_results[:pass]
+            results[:fail] += asset_results[:fail]
+          end
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grabass
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-26 00:00:00.000000000 Z
+date: 2012-06-11 00:00:00.000000000 Z
 dependencies: []
 description: Grab static assets and put them somewhere
 email: brian.carstensen@gmail.com