boom 0.1.1 → 0.1.2

data/CHANGELOG.markdown

@@ -1,6 +1,16 @@
 # boom changes
 
-## 0.1.11
+## head
+
+## 0.1.2
+- Copy to clipboard doesn't hang anymore. Sweet. Thanks,
+  [mcollina](https://github.com/mcollina).
+- Holy hell, [brettbuddin](https://github.com/brettbuddin) added completion for
+  zsh. Pretty awesome too.
+- [antonlindstrom](https://github.com/antonlindstrom) fixed up the MongoDB
+  backend.
+
+## 0.1.1
 - Don't force Redis on everyone.
 
 ## 0.1.0

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.1.1'
-  s.date              = '2011-02-28'
+  s.version           = '0.1.2'
+  s.date              = '2011-03-11'
   s.rubyforge_project = 'boom'
 
   ## Make sure your summary is short. The description may be as long
@@ -71,6 +71,7 @@ Gem::Specification.new do |s|
     Rakefile
     bin/boom
     boom.gemspec
+    completion/README.md
     completion/boom.bash
     completion/boom.zsh
     lib/boom.rb

data/completion/README.md

@@ -0,0 +1,7 @@
+# boom completion
+
+To add autocompletion to your shell, look in this directory and grab the script
+that matches your corresponding shell.
+
+I use the Z shell, so hey, I picked `boom.zsh`. And trust me: after a couple minutes of
+playing with it, you'll never look back. NEVER!

data/completion/boom.zsh

@@ -1,18 +1,29 @@
-# oh hai!
-#
-# someone should fork this and add autocompletion for zsh
-#
-# you'd be pretty cool
-#
-# and I'd give you a high-five
-#
-#
-#
-# and maybe a whiskey
-#
-#
-#
-#
-#
-#
-# a couple of whiskeys
+#compdef boom
+
+local state line cmds ret=1
+
+_arguments -C '1: :->cmds' '*: :->args'
+
+case $state in
+  cmds)
+    local -a cmds
+    cmds=(
+      'all:show all items in all lists'
+      'edit:edit the boom JSON file in $EDITOR'
+      'help:help text'
+    )
+    _describe -t commands 'boom command' cmds && ret=0
+    _values 'lists' $(boom | awk '{print $1}')
+    ;;
+  args)
+    case $line[1] in
+      (boom|all|edit|help)
+        ;;
+      *)
+        _values 'items' `boom $line[1] | awk '{print $1}' | sed -e 's/://'` 2>/dev/null && ret=0
+        ;;
+    esac
+    ;;
+esac
+
+return ret

data/lib/boom/config.rb

@@ -48,7 +48,7 @@ module Boom
     # Returns whether the attributes were saved.
     def bootstrap
       @attributes = {
-        :backend => 'JSON'
+        :backend => 'json'
       }
       save
     end

data/lib/boom/platform.rb

@@ -45,7 +45,7 @@ module Boom
       def copy(item)
         copy_command = darwin? ? "pbcopy" : "xclip -selection clipboard"
 
-        `echo '#{item.value.gsub("\'","\\'")}' | tr -d "\n" | #{copy_command}`
+        Kernel.system("echo '#{item.value.gsub("\'","\\'")}' | tr -d \"\n\" | #{copy_command}")
 
         "Boom! We just copied #{item.value} to your clipboard."
       end

data/lib/boom/storage/mongodb.rb

@@ -1,67 +1,57 @@
 # coding: utf-8
 
 # Storage adapter that saves data from boom to MongoDB instead of JSON file.
-#
-# This was grabbed from antonlindstrom's fork, but he wrote it before the 0.1.0
-# changes to boom. It would need to be updated to use Boom::Config and to
-# inherit methods from Boom::Storage::Base. Until then, this is chillin' here
-# until it gets fixed.
+begin
+  require 'mongo'
+  require 'json/pure' # Will be here for now See Issue#21
+rescue LoadError
+end
 
 module Boom
   module Storage
-    class MongoDB
+    class Mongodb < Base
       
-      MONGO_CFG = "#{ENV['HOME']}/.boomdb.conf"
-
-      # Public: the path to the JSON Mongo config file, userdata.
-      #
-      # Returns the String path of boom's MongoDB userdata
-      def mongo_cfg
-        MONGO_CFG
-      end
-
-      # Public: initializes a Storage instance by loading in your persisted data.
+      # Public: Initialize MongoDB connection and check dep.
       #
-      # Returns the Storage instance.
-      def initialize
-        require 'mongo'
+      # Returns Mongo connection
+      def mongo
+        @mongo ||= ::Mongo::Connection.new(
+          Boom.config.attributes["mongodb"]["host"],
+          Boom.config.attributes["mongodb"]["port"]
+        ).db(Boom.config.attributes["mongodb"]["database"])
         
-        @lists = []
-        @mongo_coll = nil
-        mongo_initialize(mongo_cfg) # Initialize the MongoDB and set data in memory
-        collect
+        @mongo.authenticate(
+          Boom.config.attributes['mongodb']['username'], 
+          Boom.config.attributes['mongodb']['password']
+        )
+      
+        # Return connection
+        @mongo
+      rescue NameError => e
+        puts "You don't have the Mongo gem installed yet:\n  gem install mongo"
+       exit
       end
-
-      # Public: return the list from mongodb
+      
+      # Public: The MongoDB collection
       #
-      # Returns list
-      def lists
-        @lists
+      # Returns the MongoDB collection
+      def collection
+        @collection ||= mongo.collection(Boom.config.attributes["mongodb"]["collection"])
       end
-
-      # Public: Save to MongoDB
-      #
-      # lists_json - the list to be saved in JSON format
+      
+      # Public: Bootstrap
       #
-      # Returns whatever mongo returns.
-      def save(lists_json)
-        doc = @mongo_coll.find_one()
-        @mongo_coll.update({"_id" => doc["_id"]}, {'boom' => lists_json})
-      end
-
-    # INTERNAL METHODS ##########################################################
+      # Returns
+      def bootstrap
+        collection.insert("boom" => '{"lists": [{}]}') if collection.find_one.nil?
+      end   
 
-      # Take a JSON representation of data and explode it out into the consituent
-      # Lists and Items for the given Storage instance.
+      # Public: Populates the memory list from MongoDB
       #
-      # Returns nothing.
-      def collect
-
-        s = @mongo_coll.find_one['boom']
-        storage = Yajl::Parser.new.parse(s)
-
-        return if storage['lists'].nil?
-
+      # Returns nothing
+      def populate
+        storage = JSON.parse(collection.find_one['boom']) || []
+              
         storage['lists'].each do |lists|
           lists.each do |list_name, items|
             @lists << list = List.new(list_name)
@@ -72,68 +62,24 @@ module Boom
               end
             end
           end
-        end
+        end   
       end
-
-    ##### MONGODB ######
-
-      # Initialize MongoDB and set data in memory
-      #
-      # config_file - The MongoDB config_file path defined
-      #
-      # Returns database obj.
-      def mongo_initialize(config_file)
-        bootstrap_config(config_file) unless File.exists?(config_file)
-        config = parse_mongo_cfg(config_file)
-
-        db = Mongo::Connection.new(config['host'], config['port']).db(config['database'])
-        auth = db.authenticate(config['username'], config['password'])
-
-        # Get collection collection;
-        @mongo_coll = db.collection(config['collection'])
-
-        @mongo_coll.insert("boom" => '{"lists": [{}]}') if @mongo_coll.find_one.nil?
-
-        return @mongo_coll
-      end
-
-      # Parse Mongo JSON Config
-      #
-      # config_file - The MongoDB config_file path defined
+      
+      # Public: Save to MongoDB
       #
-      # Returns a hash of Mongo Userdata
-      def parse_mongo_cfg(config_file)
-
-        mongod = Hash.new
-        config = Yajl::Parser.new.parse(File.open(config_file, 'r'))
-
-        config.each_pair do |type, data|
-          mongod[type] = data
-        end
-        return mongod
+      # Returns Mongo ID
+      def save
+        doc = collection.find_one()
+        collection.update({"_id" => doc["_id"]}, {'boom' => to_json})
       end
-
-      # Run a default config
-      #
-      # config_file - The MongoDB config_file path defined
+      
+      # Public: Convert to JSON
       #
-      # Returns File obj.
-      def bootstrap_config(config_file)
-        config = Hash.new
-
-        config['host'] = 'localhost'
-        config['port'] = '27017'
-        config['database'] = 'boom'
-        config['username'] = 'boom'
-        config['password'] = 's3cr3t'
-        config['collection'] = 'boom'
-
-        # Write to CFG
-        json_cfg =  Yajl::Encoder.encode(config, :pretty => true)
-        File.open(config_file, 'w') {|f| f.write(json_cfg) }
+      # Returns
+      def to_json
+       JSON.generate(to_hash)
       end
-
-
+      
     end
   end
-end
+end

data/lib/boom.rb

@@ -25,7 +25,7 @@ require 'boom/storage/mongodb'
 require 'boom/core_ext/symbol'
 
 module Boom
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 
   extend self
 

data/test/test_config.rb

@@ -14,7 +14,7 @@ class TestConfig < Test::Unit::TestCase
 
   def test_bootstraps_config
     @config.bootstrap
-    assert_equal ({:backend => 'JSON'}), @config.attributes
+    assert_equal ({:backend => 'json'}), @config.attributes
   end
 
   def test_attributes

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: boom
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Zach Holman
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-28 00:00:00 -08:00
+date: 2011-03-11 00:00:00 -08:00
 default_executable: boom
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -73,6 +73,7 @@ files:
 - Rakefile
 - bin/boom
 - boom.gemspec
+- completion/README.md
 - completion/boom.bash
 - completion/boom.zsh
 - lib/boom.rb