boom 0.3.0 → 0.4.0

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 # boom changes
 ## head
 
+## 0.4.0
+- Returns an error if you try to `open` something that doesn't exist.
+  ([@romainberger](https://github.com/romainberger), #90).
+- Removes `--delete` in favor of going to `boom delete x`
+  ([@eugeneius](https://github.com/holman/boom/pull/89), #89).
+
 ## 0.3.0
 - 0.3 removes all the Storage nonsense in favor of clean and easy JSON. Less
   code is best code.

data/README.md

@@ -24,6 +24,9 @@ For more details about what boom is and how it works, check out
     $ boom shirt
     Boom! Just copied http://cl.ly/NwCS/shirt.gif to your clipboard.
 
+    $ boom delete gifs shirt
+    Boom! shirt is gone forever.
+
 And that's just a taste! I know, you're salivating, I can hear you from here.
 (Why your saliva is noisy is beyond me.) Check out the [full list of
 commands](https://github.com/holman/boom/wiki/Commands).
@@ -51,4 +54,4 @@ All good? Cool! Then [send me a pull request](https://github.com/holman/boom/pul
 [@holman](http://twitter.com/holman) — if you're having issues, want me to
 merge in your pull request, or are using boom in a cool way. I'm kind of hoping
 this is generic enough that people do some fun things with it. First one to use
-`boom` to calculate their tax liability wins.
+`boom` to calculate their tax liability wins.

data/Rakefile

@@ -75,9 +75,9 @@ task :release => :build do
     puts "You must be on the master branch to release!"
     exit!
   end
-  sh "git commit --allow-empty -a -m 'Release #{version}'"
-  sh "git tag v#{version}"
-  sh "git push origin master"
+  # sh "git commit --allow-empty -a -m 'Release #{version}'"
+  # sh "git tag v#{version}"
+  # sh "git push origin master"
   sh "git push origin v#{version}"
   sh "gem push pkg/#{name}-#{version}.gem"
 end

data/boom.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'boom'
-  s.version           = '0.3.0'
-  s.date              = '2013-03-29'
+  s.version           = '0.4.0'
+  s.date              = '2013-08-18'
   s.rubyforge_project = 'boom'
 
   ## Make sure your summary is short. The description may be as long

data/lib/boom/command.rb

@@ -92,22 +92,24 @@ module Boom
         return help              if command == 'help'
         return help              if command[0] == 45 || command[0] == '-' # any - dash options are pleas for help
         return echo(major,minor) if command == 'echo' || command == 'e'
+        return copy(major,minor) if command == 'copy' || command == 'c'
         return open(major,minor) if command == 'open' || command == 'o'
         return random(major)     if command == 'random' || command == 'rand' || command == 'r'
 
-        # if we're operating on a List
-        if storage.list_exists?(command)
-          return delete_list(command) if major == '--delete'
-          return detail_list(command) unless major
-          unless minor == '--delete'
-            return add_item(command,major,minor) if minor
-            return add_item(command,major,stdin.read) if stdin.stat.size > 0
-            return search_list_for_item(command, major)
+        if command == 'delete' || command == 'd'
+          if minor
+            return delete_item(major, minor)
+          else
+            return delete_list(major)
           end
         end
 
-        if minor == '--delete' and storage.item_exists?(major)
-          return delete_item(command, major)
+        # if we're operating on a List
+        if storage.list_exists?(command)
+          return detail_list(command) unless major
+          return add_item(command,major,minor) if minor
+          return add_item(command,major,stdin.read) if stdin.stat.size > 0
+          return search_list_for_item(command, major)
         end
 
         return search_items(command) if storage.item_exists?(command) and !major
@@ -136,17 +138,25 @@ module Boom
           list = List.find(major)
           if minor
             item = storage.items.detect { |item| item.name == minor }
-            output "#{cyan("Boom!")} We just opened #{yellow(Platform.open(item))} for you."
+            if item
+              output "#{cyan("Boom!")} We just opened #{yellow(Platform.open(item))} for you."
+            else
+              output "Couldn't find #{yellow(minor)}."
+            end
           else
             list.items.each { |item| Platform.open(item) }
             output "#{cyan("Boom!")} We just opened all of #{yellow(major)} for you."
           end
         else
           item = storage.items.detect { |item| item.name == major }
-          output "#{cyan("Boom!")} We just opened #{yellow(Platform.open(item))} for you."
+          if item
+            output "#{cyan("Boom!")} We just opened #{yellow(Platform.open(item))} for you."
+          else
+            output "Couldn't find #{yellow(major)}."
+          end
         end
       end
-      
+
       # Public: Opens a random item
       #
       # Returns nothing.
@@ -161,9 +171,9 @@ module Boom
         else
           output "We couldn't find that list."
         end
-        open(item.name, nil) unless item.nil? 
+        open(item.name, nil) unless item.nil?
       end
-      
+
       # Public: echoes only the Item's value without copying
       #
       # item_name - the String term to search for in all Item names
@@ -183,6 +193,23 @@ module Boom
         output item.value
       end
 
+      # Public: Copies to clipboard the Item's value without printing to screen
+      #
+      # Returns nothing
+      def copy(major, minor)
+        unless minor
+          item = storage.items.detect do |item|
+            item.name == major
+          end
+          return output "#{yellow(major)} #{red("not found")}" unless item
+        else
+          list = List.find(major)
+          item = list.find_item(minor)
+          return output "#{yellow(minor)} #{red("not found in")} #{yellow(major)}" unless item
+        end
+        Platform.copy(item)
+      end
+
       # Public: add a new List.
       #
       # name  - the String name of the List.
@@ -265,7 +292,7 @@ module Boom
         end
       end
 
-      # Public: search for an Item in all lists by name. Drops the 
+      # Public: search for an Item in all lists by name. Drops the
       # corresponding entry into your clipboard.
       #
       # name - the String term to search for in all Item names
@@ -279,7 +306,7 @@ module Boom
         output "#{cyan("Boom!")} We just copied #{yellow(Platform.copy(item))} to your clipboard."
       end
 
-      # Public: search for an Item in a particular list by name. Drops the 
+      # Public: search for an Item in a particular list by name. Drops the
       # corresponding entry into your clipboard if found.
       #
       # list_name - the String name of the List in which to scope the search
@@ -329,10 +356,10 @@ module Boom
           boom all                      show all items in all lists
           boom edit                     edit the boom JSON file in $EDITOR
           boom help                     this help text
-          
+
           boom <list>                   create a new list
           boom <list>                   show items for a list
-          boom <list> --delete          deletes a list
+          boom delete <list>            deletes a list
 
           boom <list> <name> <value>    create a new list item
           boom <name>                   copy item's value to clipboard
@@ -343,7 +370,9 @@ module Boom
           boom random <list>            open a random item's url for a list in browser
           boom echo <name>              echo the item's value without copying
           boom echo <list> <name>       echo the item's value without copying
-          boom <list> <name> --delete   deletes an item
+          boom copy <name>              copy the item's value without echo
+          boom copy <list> <name>       copy the item's value without echo
+          boom delete <list> <name>     deletes an item
 
           all other documentation is located at:
             https://github.com/holman/boom

data/lib/boom/platform.rb

@@ -14,7 +14,7 @@ module Boom
       #
       # Returns true if running on darwin (MacOS X), else false
       def darwin?
-        !!(RUBY_PLATFORM =~ /darwin/)
+        !!(RbConfig::CONFIG['host_os'] =~ /darwin/)
       end
 
       # Public: tests if currently running on windows.
@@ -23,7 +23,7 @@ module Boom
       #
       # Returns true if running on windows (win32/mingw32), else false
       def windows?
-        !!(RUBY_PLATFORM =~ /mswin|mingw/)
+        !!(RbConfig::CONFIG['host_os'] =~ /mswin|mingw/)
       end
 
       # Public: returns the command used to open a file or URL
@@ -35,7 +35,7 @@ module Boom
       def open_command
         if darwin?
           'open'
-        elsif windows? 
+        elsif windows?
           'start'
         else
           'xdg-open'
@@ -69,14 +69,20 @@ module Boom
           'xclip -selection clipboard'
         end
       end
-      
+
       # Public: copies a given Item's value to the clipboard. This method is
       # designed to handle multiple platforms.
       #
       # Returns the String value of the Item.
       def copy(item)
-        IO.popen(copy_command,"w") {|cc|  cc.write(item.value)}
-        item.value
+        begin
+          IO.popen(copy_command,"w") {|cc|  cc.write(item.value)}
+          item.value
+        rescue Errno::ENOENT
+          puts item.value
+          puts "Please install #{copy_command[0..5]} to copy this item to your clipboard"
+          exit
+        end
       end
 
       # Public: opens the JSON file in an editor for you to edit. Uses the
@@ -86,7 +92,7 @@ module Boom
       #
       # Returns a String with a helpful message.
       def edit(json_file)
-        unless $EDITOR.nil?
+        unless ENV['EDITOR'].nil?
           unless windows?
             system("`echo $EDITOR` #{json_file} &")
           else

data/lib/boom.rb

@@ -20,9 +20,9 @@ require 'boom/storage'
 require 'boom/core_ext/symbol'
 
 module Boom
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 
   def self.storage
     @storage ||= Storage.new
   end
-end
+end

data/test/item.sh

@@ -10,10 +10,14 @@ it_adds_an_item() {
 }
 
 it_deletes_an_item() {
-  yes | $boom urls google --delete | grep 'gone forever'
+  yes | $boom delete urls google | grep 'gone forever'
   $boom urls google | grep 'not found'
 }
 
 it_echos_an_item() {
   $boom echo site | grep 'zachholman.com'
-}
+}
+
+it_handles_open_on_nonexistent_item() {
+  $boom open nadda | grep "nadda"
+}

data/test/list.sh

@@ -25,6 +25,6 @@ it_shows_a_list() {
 
 it_deletes_a_list() {
   $boom | grep "enemies"
-  yes | $boom enemies --delete | grep "Deleted"
+  yes | $boom delete enemies | grep "Deleted"
   ! $boom | grep "enemies"
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: boom
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-29 00:00:00.000000000 Z
+date: 2013-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby