artifacts 2.0.1 → 2.0.2

data/artifacts.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.summary     = %q{A console based ticket (bug/feature) tracker who's data travels inside your repository}
   s.description = %q{A console based ticket (bug/feature) tracker who's data travels inside your repository}
 
-  s.add_dependency "yaml-model", ">= 1.3.1"
+  s.add_dependency "yaml-model", ">= 1.3.2"
 
   s.add_development_dependency "bundler", ">= 1.0.0"
   s.add_development_dependency "rspec", ">= 1.3.0"

data/lib/artifacts/artifact.rb

@@ -26,17 +26,18 @@ class Artifacts
     end
 
     def to_s
-      "%#{YAML_Model.next_oid.to_s.length}d #{created.strftime('%Y-%m-%d')} #{creator} [#{tags.join(',')}] (#{dependants.size}:#{dependees.size})\n#{' '*YAML_Model.next_oid.to_s.length} %s"%[id,summary]
+      "%#{YAML_Model.next_oid.to_s.length}d #{summary}"%[id]
     end
 
     def inspect
-      spaces = YAML_Model.next_oid.to_s.length + 2
+      indentation = ' '*(YAML_Model.next_oid.to_s.length + 1)
       "#{to_s}\n" +
-                               ' '*spaces + 'created    : ' + created.to_s + "\n" +
-      ( closed              ? (' '*spaces + 'closed     : ' + closed.to_s + "\n" ) : '' ) +
-      ( dependees.size  > 0 ? (' '*spaces + 'dependees  : [' + dependees.map{|n|n.id}.join(',') + "]\n" ) : '' ) +
-      ( dependants.size > 0 ? (' '*spaces + 'dependants : [' + dependants.map{|n|n.id}.join(',') + "]\n" ) : '' ) +
-      ( comments.size > 0   ? (' '*spaces + "comments   :\n" + comments.join("\n")) : '' )
+                               indentation + 'created    : ' + created.to_s + "\n" +
+      ( closed              ? (indentation + 'closed     : ' + closed.to_s + "\n" ) : '' ) +
+      ( tags.size  > 0      ? (indentation + 'tags       : [' + tags.map{|n|n.name}.join(',') + "]\n" ) : '' ) +
+      ( dependees.size  > 0 ? (indentation + 'dependees  : [' + dependees.map{|n|n.id}.join(',') + "]\n" ) : '' ) +
+      ( dependants.size > 0 ? (indentation + 'dependants : [' + dependants.map{|n|n.id}.join(',') + "]\n" ) : '' ) +
+      ( comments.size > 0   ? (indentation + "comments   :\n" + comments.join("\n")) : '' )
     end
 
   end

data/lib/artifacts/executable.rb

@@ -32,9 +32,17 @@ class Artifacts
       end
 
       @artifacts = []
-      while args.first =~ /^\d+$/
-        @artifacts << Artifact[ args.shift.to_i ]
+      while match = args.first && args.first.match( /^(?:(\d+)|#(#{Tag::VALID_NAME}))$/ )
+        if match[1]
+          @artifacts << Artifact[ args.shift.to_i ]
+        elsif match[2]
+          args.shift
+          tag = Tag.select{|n|n.name == match[2]}.first
+          @artifacts << tag.artifacts if tag
+        end
       end
+      @artifacts.flatten!
+      @artifacts.uniq!
 
       command = args.shift
       command ||= :help
@@ -79,9 +87,8 @@ class Artifacts
 
     def closed
       @artifacts = @artifacts.select{|n|n.closed}
-      if @artifacts.empty?
-        @artifacts = Artifact.select{|a|a.closed != nil}.sort{|a,b|a.closed<=>b.closed}
-      end
+      @artifacts = Artifact.select{|a|a.closed} if @artifacts.empty?
+      @artifacts = @artifacts.sort{|a,b|a.closed<=>b.closed}
       list
     end
 
@@ -124,6 +131,24 @@ class Artifacts
       end
     end
 
+    def untag( *args )
+      args.each do |tag_name|
+        tag = Tag.select{|n|n.name == tag_name}.first
+        @artifacts.each do |artifact|
+          artifact.remove_tag( tag )
+        end
+      end
+    end
+
+    def prune
+      Tag.all.sort{|a,b|a.name <=> b.name}.each do |tag|
+        if tag.artifacts.size == 0
+          puts "Pruning tag: #{tag.name}"
+          tag.delete
+        end
+      end
+    end
+
     def tags( *args )
       Tag.all.each do |tag|
         puts tag.inspect

data/lib/artifacts/tag.rb

@@ -2,7 +2,11 @@ class Artifacts
 
   Artifact ||= Class.new( YAML_Model )
   class Tag < YAML_Model
-    type :name, String
+    InvalidName = Class.new( Exception )
+    VALID_NAME = '[-a-z]+'
+    type :name, String do |value|
+      raise InvalidName unless value =~ /^#{VALID_NAME}$/
+    end
     has :artifacts, Artifact, :many_to_many => true
     init :name
     def to_s

data/lib/artifacts/version.rb

@@ -1,3 +1,3 @@
 class Artifacts
-  VERSION = "2.0.1"
+  VERSION = "2.0.2"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 2
   - 0
-  - 1
-  version: 2.0.1
+  - 2
+  version: 2.0.2
 platform: ruby
 authors: 
 - Clive Crous
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-14 00:00:00 +02:00
+date: 2011-02-16 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,8 +27,8 @@ dependencies:
         segments: 
         - 1
         - 3
-        - 1
-        version: 1.3.1
+        - 2
+        version: 1.3.2
   type: :runtime
   prerelease: false
   version_requirements: *id001
@@ -114,7 +114,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 517004353
+      hash: -44831437
       segments: 
       - 0
       version: "0"
@@ -123,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 517004353
+      hash: -44831437
       segments: 
       - 0
       version: "0"