tag 0.2.1 → 0.3.0

data/.gemspec

@@ -12,12 +12,11 @@ Gem::Specification.new do |s|
   s.description = "This project lets you tag anything from the commandline. The `tag` executable provides a consistent way to add, remove and modify tags for tagged items. The goal is to make tagging dead simple and usable by other commandline apps. In making tags a first class nix citizen, perhaps they will see the light of day."
   s.required_rubygems_version = ">= 1.3.6"
   s.executables  = %w(tag)
-  s.add_dependency 'thor', '~> 0.14.6'
+  s.add_dependency 'boson', '~> 1.0.0'
   s.add_development_dependency 'bahia', '~> 0.4.0'
   s.add_development_dependency 'minitest', '~> 2.11.0'
   s.add_development_dependency 'rake', '~> 0.9.2'
-  s.files = Dir.glob(%w[{lib,spec}/**/*.rb bin/* [A-Z]*.{txt,rdoc,md} ext/**/*.{rb,c} **/deps.rip]) + %w{Rakefile .gemspec}
-  s.files += %w{.travis.yml}
+  s.files = Dir.glob(%w[{lib,spec}/**/*.rb bin/* [A-Z]*.{txt,rdoc,md} ext/**/*.{rb,c} **/deps.rip]) + %w{Rakefile .gemspec .travis.yml}
   s.extra_rdoc_files = ["README.md", "LICENSE.txt"]
   s.license = 'MIT'
 end

data/CHANGELOG.rdoc

@@ -1,3 +1,6 @@
+== 0.3.0
+* Switch out thor for boson
+
 == 0.2.1
 * Fix gemspec loading
 * Update dev dependencies

data/README.md

@@ -10,8 +10,8 @@ Examples
 
 Let's start with tagging animals:
 
-    $ tag add horse -t fast strong
-    $ tag add cat -t fast independent
+    $ tag add horse -t fast,strong
+    $ tag add cat -t fast,independent
     $ tag add dog -t loving
     $ tag list fast
     horse
@@ -21,8 +21,8 @@ Tired of animals, let's tag cities. To avoid interfering with
 the animals list, we'll use a cities model:
 
     $ tag add nyc -t fast fun -m cities
-    $ tag add boston -t educated clean -m cities
-    $ tag add paris -t awesome delicious
+    $ tag add boston -t educated,clean -m cities
+    $ tag add paris -t awesome,delicious
     $ tag list fast -m cities
     nyc
     # to avoid typing '-m cities' for every command
@@ -47,5 +47,4 @@ Todo
 * Several more tag actions
 * Description and time fields
 * Make storage agnostic
-* Switch from thor to boson
 * Explain how to integrate with other commandline apps

data/deps.rip

@@ -1 +1 @@
-thor ~>0.14.6
+boson ~>1.0.0

data/lib/tag/runner.rb

@@ -1,35 +1,38 @@
-require 'thor'
+require 'boson/runner'
 
 module Tag
-  class Runner < Thor
+  class Runner < Boson::Runner
     def self.model_option
-      method_option :model, :type => :string, :aliases => '-m'
+      option :model, :type => :string
     end
 
     model_option
-    method_option :tags, :type => :array, :required => true, :aliases => '-t'
-    desc "add *ITEMS -t *TAGS", 'add tag(s) to item(s)'
+    option :tags, :type => :array, :required => true
+    desc 'add tag(s) to item(s)'
     def add(*items)
+      options = items[-1].is_a?(Hash) ? items.pop : {}
       Tag.store(options[:model]).multi_tag(items, options[:tags])
     end
 
     model_option
-    method_option :tags, :type => :array, :required => true, :aliases => '-t'
-    desc "rm *ITEMS -t *TAGS", 'remove tag(s) from item(s)'
+    option :tags, :type => :array, :required => true
+    desc 'remove tag(s) from item(s)'
     def rm(*items)
+      options = items[-1].is_a?(Hash) ? items.pop : {}
       Tag.store(options[:model]).multi_remove_tag(items, options[:tags])
     end
 
     model_option
-    desc "list TAG", 'list items by tag'
-    def list(tag)
+    desc 'list items by tag'
+    def list(tag, options={})
       puts Tag.store(options[:model]).list(tag)
     end
 
     model_option
-    method_option :rm, :type => :boolean, :desc => 'remove tags'
-    desc "tags", 'list or remove tags'
+    option :rm, :type => :boolean, :desc => 'remove tags'
+    desc 'list or remove tags'
     def tags(*args)
+      options = args[-1].is_a?(Hash) ? args.pop : {}
       if options[:rm]
         Tag.store(options[:model]).delete_tags(*args)
       else
@@ -38,12 +41,12 @@ module Tag
     end
 
     model_option
-    desc "tree", 'print tags with their items underneath them'
-    def tree
+    desc 'print tags with their items underneath them'
+    def tree(options={})
       puts Tag.store(options[:model]).tree
     end
 
-    desc "models", 'list models'
+    desc 'list models'
     def models
       puts Tag::Store.models
     end

data/lib/tag/version.rb

@@ -1,3 +1,3 @@
 module Tag
-  VERSION = '0.2.1'
+  VERSION = '0.3.0'
 end

data/spec/runner_spec.rb

@@ -15,7 +15,7 @@ describe Tag::Runner do
     end
 
     it "adds two tags" do
-      tag 'add feynman -t physicist teacher'
+      tag 'add feynman -t physicist,teacher'
       tagged('physicist').must_equal ["feynman"]
       tagged('physicist').must_equal ["feynman"]
     end
@@ -47,22 +47,22 @@ describe Tag::Runner do
 
   describe "rm" do
     it "removes a tag" do
-      tag 'add newton -t physicist fig'
+      tag 'add newton -t physicist,fig'
       tag 'rm newton -t fig'
       tagged('physicist').must_equal ['newton']
       tagged('fig').must_equal []
     end
 
     it "removes two tags" do
-      tag 'add newton -t physicist fig sir'
-      tag 'rm newton -t fig sir'
+      tag 'add newton -t physicist,fig,sir'
+      tag 'rm newton -t fig,sir'
       tagged('physicist').must_equal ['newton']
       tagged('fig').must_equal []
       tagged('sir').must_equal []
     end
 
     it "removes two items from a tag" do
-      tag 'add newton -t physicist fig'
+      tag 'add newton -t physicist,fig'
       tag 'add tree -t fig'
       tag 'rm newton tree -t fig'
       tagged('fig').must_equal []
@@ -74,7 +74,7 @@ describe Tag::Runner do
     end
 
     it "with model option removes a tag from other model" do
-      tag 'add newton -t physicist fig -m physics'
+      tag 'add newton -t physicist,fig -m physics'
       tag 'rm newton -t fig -m physics'
       tagged('physicist -m physics').must_equal ['newton']
       tagged('physicist').must_equal []
@@ -83,13 +83,13 @@ describe Tag::Runner do
 
   describe "tags" do
     it "by default lists all tags" do
-      tag 'add fermi -t italian german irish'
+      tag 'add fermi -t italian,german,irish'
       tag 'tags'
       stdout.split("\n").must_equal %w{german irish italian}
     end
 
     it "with model option lists all tags for another model" do
-      tag 'add fermi -t italian german irish -m physicist'
+      tag 'add fermi -t italian,german,irish -m physicist'
       tag 'tags -m physicist'
       stdout.split("\n").must_equal %w{german irish italian}
       tag 'tags'
@@ -97,8 +97,8 @@ describe Tag::Runner do
     end
 
     it "with rm option deletes tags" do
-      tag 'add fermi -t italian german irish'
-      tag 'add davinci -t italian german irish'
+      tag 'add fermi -t italian,german,irish'
+      tag 'add davinci -t italian,german,irish'
       tag 'tags german irish --rm'
       tagged('german').must_equal []
       tagged('irish').must_equal []
@@ -106,7 +106,7 @@ describe Tag::Runner do
   end
 
   it "tree prints tree" do
-    tag 'add child -t parent1 parent2'
+    tag 'add child -t parent1,parent2'
     tag 'tree'
     stdout.chomp.must_equal [
       'parent1', '    child', 'parent2', '    child'
@@ -114,7 +114,7 @@ describe Tag::Runner do
   end
 
   it "models prints list of models" do
-    tag 'add feynman -t funny -m physicist'
+    tag 'add feynman -t funny -m=physicist'
     tag 'add cat -t independent'
     tag 'models'
     stdout.split("\n").must_equal ['default', 'physicist']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tag
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-23 00:00:00.000000000 Z
+date: 2012-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: thor
-  requirement: &70106164252560 !ruby/object:Gem::Requirement
+  name: boson
+  requirement: &70210577708060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.14.6
+        version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70106164252560
+  version_requirements: *70210577708060
 - !ruby/object:Gem::Dependency
   name: bahia
-  requirement: &70106164177780 !ruby/object:Gem::Requirement
+  requirement: &70210577707580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *70106164177780
+  version_requirements: *70210577707580
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70106164177020 !ruby/object:Gem::Requirement
+  requirement: &70210577707000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.11.0
   type: :development
   prerelease: false
-  version_requirements: *70106164177020
+  version_requirements: *70210577707000
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70106164176360 !ruby/object:Gem::Requirement
+  requirement: &70210577706480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70106164176360
+  version_requirements: *70210577706480
 description: This project lets you tag anything from the commandline. The `tag` executable
   provides a consistent way to add, remove and modify tags for tagged items. The goal
   is to make tagging dead simple and usable by other commandline apps. In making tags
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.16
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: tag anything from the commandline