boom 0.2.3 → 0.2.4

data/CHANGELOG.markdown

@@ -1,6 +1,8 @@
 # boom changes
-
 ## head
+- [@Dlom](https://github.com/Dlom) fixed some troubles in #49.
+- Some additional test coverage added by
+  [@nickhammond](https://github.com/nickhammond).
 
 ## 0.2.3
 - [@culvr](https://github.com/culvr) added `boom random <list>` that lets you

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    boom (0.2.1)
+    boom (0.2.3)
       json_pure (~> 1.5.3)
       multi_json (~> 1.0.3)
 

data/Rakefile

@@ -52,22 +52,6 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-desc "Generate RCov test coverage and open in your browser"
-task :coverage do
-  require 'rcov'
-  sh "rm -fr coverage"
-  sh "rcov test/test_*.rb"
-  sh "open coverage/index.html"
-end
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "#{name} #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
 desc "Open an irb session preloaded with this library"
 task :console do
   sh "irb -rubygems -r ./lib/#{name}.rb"

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.2.3'
-  s.date              = '2011-09-06'
+  s.version           = '0.2.4'
+  s.date              = '2013-03-15'
   s.rubyforge_project = 'boom'
 
   ## Make sure your summary is short. The description may be as long
@@ -89,7 +89,6 @@ Gem::Specification.new do |s|
     lib/boom/storage.rb
     lib/boom/storage/base.rb
     lib/boom/storage/gist.rb
-    lib/boom/storage/gist/json_parser.rb
     lib/boom/storage/json.rb
     lib/boom/storage/keychain.rb
     lib/boom/storage/mongodb.rb

data/completion/boom.bash

@@ -1,23 +1,17 @@
 _boom_complete() {
-    local cur prev lists
+    local cur prev lists curr_list items
     COMPREPLY=()
     cur="${COMP_WORDS[COMP_CWORD]}"
     prev="${COMP_WORDS[COMP_CWORD-1]}"
+    curr_list=`eval echo "$prev"`
+    local IFS=$'\n'
 
-    lists=`boom | awk '{print $1}'`
-
-    case "${prev}" in
-      boom)
-        COMPREPLY=( $(compgen -W "${lists}" -- ${cur}) )
-        return 0
-        ;;
-      *)
-        for ((i = 0; i < ${#lists}; i++)); do
-          local items=`boom $prev | awk '{print $1}' | sed -e 's/://'`
-          COMPREPLY=( $(compgen -W "${items}" -- ${cur}))
-          return 0
-        done
-        ;;
-    esac
+    if [ $COMP_CWORD -eq 1 ]; then
+        lists=`boom | sed 's/^  \(.*\) ([0-9]\+)$/\1/'`
+        COMPREPLY=( $( compgen -W '${lists}' -- ${cur} ) )
+    elif [ $COMP_CWORD -eq 2 ]; then
+        items=`boom $curr_list | sed 's/^    \(.\{0,16\}\):.*$/\1/'`
+        COMPREPLY=( $( compgen -W '${items}' -- ${cur} ) )
+    fi
 }
-complete -F _boom_complete boom
+complete -o filenames -F _boom_complete boom

data/lib/boom/color.rb

@@ -33,8 +33,14 @@ module Boom
     #   colorize("Boom!", :magenta)
     #   # => "\e[35mBoom!\e[0m"
     #
-    # Returns the wrapped String.
+    # Returns the wrapped String unless the the platform is windows and
+    # does not have Win32::Console, in which case, returns the String.
     def colorize(string, color_code)
+      if !defined?(Win32::Console) && !!(RUBY_PLATFORM =~ /win32/ || RUBY_PLATFORM =~ /mingw32/)
+        # looks like this person doesn't have Win32::Console and is on windows
+        # just return the uncolorized string
+        return string
+      end
       "#{CODES[color_code] || color_code}#{string}#{CODES[:reset]}"
     end
 

data/lib/boom/command.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 
 # Command is the main point of entry for boom commands; shell arguments are
-# passd through to Command, which then filters and parses through indivdual
+# passd through to Command, which then filters and parses through individual
 # commands and reroutes them to constituent object classes.
 #
 # Command also keeps track of one connection to Storage, which is how new data
@@ -108,12 +108,12 @@ module Boom
           end
         end
 
-        return search_items(command) if storage.item_exists?(command)
-
         if minor == 'delete' and storage.item_exists?(major)
           return delete_item(command, major)
         end
 
+        return search_items(command) if storage.item_exists?(command) and !major
+
         return create_list(command, major, stdin.read) if !minor && stdin.stat.size > 0
         return create_list(command, major, minor)
       end
@@ -273,10 +273,17 @@ module Boom
       #
       # Returns nothing.
       def delete_item(list_name,name)
-        list = List.find(list_name)
-        list.delete_item(name)
-        output "#{cyan("Boom!")} #{yellow(name)} is gone forever."
-        save
+        if storage.list_exists?(list_name)
+          list = List.find(list_name)
+          if list.delete_item(name)
+            output "#{cyan("Boom!")} #{yellow(name)} is gone forever."
+            save
+          else
+            output "#{yellow(name)} #{red("not found in")} #{yellow(list_name)}"
+          end
+        else
+          output "We couldn't find that list."
+        end
       end
 
       # Public: search for an Item in all lists by name. Drops the 
@@ -329,7 +336,11 @@ module Boom
       #
       # Returns nothing.
       def edit
-        output "#{cyan("Boom!")} #{Platform.edit(storage.json_file)}"
+        if storage.respond_to?("json_file")
+          output "#{cyan("Boom!")} #{Platform.edit(storage.json_file)}"
+        else
+          output "This storage backend does not store #{cyan("Boom!")} data on your computer"
+        end
       end
 
       # Public: prints all the commands of boom.

data/lib/boom/platform.rb

@@ -48,9 +48,9 @@ module Boom
       # Returns a String of the Item value.
       def open(item)
         unless windows?
-          system("#{open_command} '#{item.url.gsub("\'","\\'")}'")
+          system("#{open_command} '#{item.url.gsub("\'","'\\\\''")}'")
         else
-          system("#{open_command} #{item.url.gsub("\'","\\'")}")
+          system("#{open_command} #{item.url.gsub("\'","'\\\\''")}")
         end
 
         item.value
@@ -75,25 +75,25 @@ module Boom
       #
       # Returns the String value of the Item.
       def copy(item)
-        unless windows?
-          system("printf '#{item.value.gsub("\'","\\'")}' | #{copy_command}")
-        else
-          system("echo #{item.value.gsub("\'","\\'")} | #{copy_command}")
-        end
-
+        IO.popen(copy_command,"w") {|cc|  cc.write(item.value)}
         item.value
       end
 
       # Public: opens the JSON file in an editor for you to edit. Uses the
       # $EDITOR environment variable, or %EDITOR% on Windows for editing.
       # This method is designed to handle multiple platforms.
+      # If $EDITOR is nil, try to open using the open_command.
       #
       # Returns a String with a helpful message.
       def edit(json_file)
-        unless windows?
-          system("`echo $EDITOR` #{json_file} &")
+        unless $EDITOR.nil?
+          unless windows?
+            system("`echo $EDITOR` #{json_file} &")
+          else
+            system("start %EDITOR% #{json_file}")
+          end
         else
-          system("start %EDITOR% #{json_file}")
+          system("#{open_command} #{json_file}")
         end
 
         "Make your edits, and do be sure to save."

data/lib/boom/storage/gist.rb

@@ -29,10 +29,8 @@ module Boom
       def bootstrap
         begin
           require "httparty"
-          require "boom/storage/gist/json_parser"
 
           self.class.send(:include, HTTParty)
-          self.class.parser JsonParser
           self.class.base_uri "https://api.github.com"
         rescue LoadError
           puts "The Gist backend requires HTTParty: gem install httparty"

data/lib/boom/storage/keychain.rb

@@ -19,15 +19,21 @@ module Boom
 
       alias_method :json_file, :open_keychain_app
 
-      # Boostraps Keychain by asking if you're using Mac OS X which is a prereq
+      # Boostraps Keychain by checking if you're using a Mac which is a prereq
       #
-      # Returns true on a Mac
+      # Returns
       def bootstrap
-        raise RuntimeError unless Boom::Platform.darwin?
-        true
+        raise RuntimeError unless is_mac?
       rescue
-        puts(e 'No Keychain utility to access, maybe try another storage option?')
-        false
+        puts('No Keychain utility to access, maybe try another storage option?')
+        exit
+      end
+      
+      # Asks if you're using Mac OS X
+      #
+      # Returns true on a Mac
+      def is_mac?
+        return Boom::Platform.darwin?
       end
 
       # Populate the in-memory store with all the lists and items from Keychain

data/lib/boom/storage/redis.rb

@@ -5,6 +5,7 @@
 begin
   require 'digest'
   require 'redis'
+  require 'uri'
 rescue LoadError
 end
 
@@ -13,8 +14,12 @@ module Boom
     class Redis < Base
 
       def redis
-        @redis ||= ::Redis.new :host => Boom.config.attributes["redis"]["host"],
-                               :port => Boom.config.attributes["redis"]["port"]
+        uri = URI.parse(Boom.config.attributes['uri'] || '')
+
+        @redis ||= ::Redis.new :host     => (uri.host     || Boom.config.attributes["redis"]["host"]),
+                               :port     => (uri.port     || Boom.config.attributes["redis"]["port"]),
+                               :user     => (uri.user     || Boom.config.attributes["redis"]["user"]),
+                               :password => (uri.password || Boom.config.attributes["redis"]["password"])
       rescue NameError => e
         puts "You don't have Redis installed yet:\n  gem install redis"
         exit

data/lib/boom.rb

@@ -28,7 +28,7 @@ require 'boom/storage/gist'
 require 'boom/core_ext/symbol'
 
 module Boom
-  VERSION = '0.2.3'
+  VERSION = '0.2.4'
 
   extend self
 

data/test/test_color.rb

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 require 'helper'
 
 class TestColor < Test::Unit::TestCase
@@ -23,4 +21,10 @@ class TestColor < Test::Unit::TestCase
     assert_equal "\e[33mYellow!\e[0m",
       Boom::Color.yellow("Yellow!")
   end
+
+  def test_cyan
+    assert_equal "\e[36mCyan!\e[0m",
+      Boom::Color.cyan("Cyan!")
+  end
+
 end

data/test/test_command.rb

@@ -74,12 +74,19 @@ class TestCommand < Test::Unit::TestCase
     assert_match /a new list called newlist.* item in newlist is blah/, command('newlist item')
   end
 
+  def test_list_creation_with_existing_items_name
+    command('list item foo')
+    assert_match /a new list called item.* key in item is bar/, command('item key bar')
+  end
+
   def test_item_access
+    IO.stubs(:popen)
     assert_match /copied https:\/\/github\.com to your clipboard/,
       command('github')
   end
 
   def test_item_access_scoped_by_list
+    IO.stubs(:popen)
     assert_match /copied https:\/\/github\.com to your clipboard/,
       command('urls github')
   end
@@ -209,4 +216,23 @@ class TestCommand < Test::Unit::TestCase
     assert_match /couldn't find that list\./, command('random 39jc02jlskjbbac9')
   end
 
+  def test_delete_item_list_not_exist
+    assert_match /couldn't find that list\./, command('urlz github delete')
+  end
+
+  def test_delete_item_wrong_list
+    command('urlz twitter https://twitter.com/')
+    assert_match /github not found in urlz/, command('urlz github delete')
+  end
+
+  def test_delete_item_different_name
+    command('foo bar baz')
+    assert_match /bar is gone forever/, command('foo bar delete')
+  end
+
+  def test_delete_item_same_name
+    command('duck duck goose')
+    assert_match /duck is gone forever/, command('duck duck delete')
+  end
+
 end

data/test/test_platform.rb

@@ -3,6 +3,7 @@ require 'helper'
 class TestPlatform < Test::Unit::TestCase
 
   def setup
+
   end
 
   def test_darwin
@@ -12,4 +13,40 @@ class TestPlatform < Test::Unit::TestCase
   def test_windows
     assert_equal Boom::Platform.windows?, true if RUBY_PLATFORM =~ /mswin|mingw/
   end
+  
+  def test_open_command_darwin
+    Boom::Platform.stubs(:darwin?).returns(true)
+    assert_equal Boom::Platform.open_command, 'open'
+  end
+  
+  def test_open_command_windows
+    Boom::Platform.stubs(:darwin?).returns(false)
+    Boom::Platform.stubs(:windows?).returns(true)
+    assert_equal Boom::Platform.open_command, 'start'
+  end
+  
+  def test_open_command_linux
+    Boom::Platform.stubs(:darwin?).returns(false)
+    Boom::Platform.stubs(:windows?).returns(false)
+    assert_equal Boom::Platform.open_command, 'xdg-open'
+  end
+
+  def test_copy_command_darwin
+    Boom::Platform.stubs(:darwin?).returns(true)
+    Boom::Platform.stubs(:windows?).returns(false)
+    assert_equal Boom::Platform.copy_command, 'pbcopy'
+  end
+
+  def test_copy_command_windows
+    Boom::Platform.stubs(:darwin?).returns(false)
+    Boom::Platform.stubs(:windows?).returns(true)
+    assert_equal Boom::Platform.copy_command, 'clip'
+  end
+
+  def test_copy_command_linux
+    Boom::Platform.stubs(:darwin?).returns(false)
+    Boom::Platform.stubs(:windows?).returns(false)
+    assert_equal Boom::Platform.copy_command, 'xclip -selection clipboard'
+  end
+  
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: boom
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Zach Holman
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-06 00:00:00 -07:00
+date: 2013-03-15 00:00:00 -07:00
 default_executable: boom
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -121,7 +121,6 @@ files:
 - lib/boom/storage.rb
 - lib/boom/storage/base.rb
 - lib/boom/storage/gist.rb
-- lib/boom/storage/gist/json_parser.rb
 - lib/boom/storage/json.rb
 - lib/boom/storage/keychain.rb
 - lib/boom/storage/mongodb.rb

data/lib/boom/storage/gist/json_parser.rb

@@ -1,8 +0,0 @@
-# coding: utf-8
-
-# Crack's parsing is no bueno. Use the MultiJson instead.
-class JsonParser < HTTParty::Parser
-  def json
-    MultiJson.decode(body)
-  end
-end