artifacts 2.0.3 → 2.1.0

data/lib/artifacts/artifact.rb

@@ -7,37 +7,66 @@ class Artifacts
     type :creator, String
     type :summary, String
 
+    type :priority, Integer, :default => 0
+
     type :created, Time, :default => Time.now
     type :closed, [NilClass,Time], :default => nil
 
-    has :dependee_references, ArtifactArtifact, ArtifactArtifact => :dependee
-    has :dependant_references, ArtifactArtifact, ArtifactArtifact => :dependant
+    has :depended_on_by_references, ArtifactArtifact, ArtifactArtifact => :depended_on_by
+    has :depends_on_references, ArtifactArtifact, ArtifactArtifact => :depends_on
 
     has :tags, Tag, :many_to_many => true
     has :comments, Comment
     init :creator, :summary
 
-    def dependants
-      dependee_references.map{|n|n.dependant}
+    def self.priority_width
+      all.map{|n|n.priority.to_s}.sort{|a,b|a.length <=> b.length}.first.length
+    end
+
+    def open?
+      closed == nil
+    end
+
+    def closed?
+      closed != nil
+    end
+
+    def <=>( other )
+      offset = ( closed? ^ other.closed? ) ? ( closed? ? 1 : -1 ) : 0
+      offset = other.open_depended_on_by.size <=> self.open_depended_on_by.size if offset == 0
+      offset = self.id <=> other.id if offset == 0
+      offset
+    end
+
+    def open_depends_on
+      depends_on.select{|n|!n.closed}
+    end
+
+    def depends_on
+      depended_on_by_references.map{|n|n.depends_on}
+    end
+
+    def open_depended_on_by
+      depended_on_by.select{|n|!n.closed}
     end
 
-    def dependees
-      dependant_references.map{|n|n.dependee}
+    def depended_on_by
+      depends_on_references.map{|n|n.depended_on_by}
     end
 
     def to_s
-      "%#{YAML_Model.next_oid.to_s.length}d #{summary}"%[id]
+      "%#{YAML_Model.next_oid.to_s.length}d #{depended_on_by.size > 0 ? 'd' : '-'}#{depends_on.size > 0 ? 'D' : '-'}#{comments.size > 0 ? 'c' : '-'} %#{self.class.priority_width}s #{summary}"%[id,closed ? 'X' : ( priority == 0 ? '' : priority.to_s )]
     end
 
     def inspect
       indentation = ' '*(YAML_Model.next_oid.to_s.length + 1)
       "#{to_s}\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")) : '' )
+                                    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" ) : '' ) +
+      ( depended_on_by.size  > 0 ? (indentation + 'depended on by : [' + depended_on_by.map{|n|n.id}.join(',') + "]\n" ) : '' ) +
+      ( depends_on.size > 0      ? (indentation + 'depends on     : [' + depends_on.map{|n|n.id}.join(',') + "]\n" ) : '' ) +
+      ( comments.size > 0        ? (indentation + "comments       :\n" + comments.join("\n")) : '' )
     end
 
   end

data/lib/artifacts/artifact_artifact.rb

@@ -1,8 +1,8 @@
 class Artifacts
   Artifact ||= Class.new( YAML_Model )
   class ArtifactArtifact < YAML_Model
-    type :dependee, Artifact
-    type :dependant, Artifact
-    init :dependee, :dependant
+    type :depended_on_by, Artifact
+    type :depends_on, Artifact
+    init :depended_on_by, :depends_on
   end
 end

data/lib/artifacts/executable.rb

@@ -33,6 +33,8 @@ class Artifacts
 
       @closed = false
       @open = true
+      @verbose = false
+      @dependants = false
 
       unless args.select{|n|n=~/^(?:-c|--closed)$/}.empty?
         @closed = true
@@ -54,7 +56,23 @@ class Artifacts
         args.delete( '--verbose' )
       end
 
+      unless args.select{|n|n=~/^(?:-d|--dependants)$/}.empty?
+        @dependants = true
+        args.delete( '-d' )
+        args.delete( '--dependants' )
+      end
+
+      unless args.select{|n|n=~/^(?:-l|--limit)$/}.empty?
+        idx = args.index( '-l' )
+        idx ||= args.index( '--limit' )
+        args.delete_at( idx )
+        @limit = args.delete_at( idx ).to_i
+      end
+
+      @limit = ( @verbose ? 3 : 10 ) if @limit.to_i < 1
+
       @artifacts = []
+      @tags = []
       any_artifacts_given = false
       while match = args.first && args.first.match( /^(?:(\d+)|#(#{Tag::VALID_NAME}))$/ )
         any_artifacts_given = true
@@ -62,22 +80,30 @@ class Artifacts
           @artifacts << Artifact[ args.shift.to_i ]
         elsif match[2]
           args.shift
+          @tags << match[2]
           tag = Tag.select{|n|n.name == match[2]}.first
           @artifacts << tag.artifacts if tag
         end
       end
+
       @artifacts.flatten!
       @artifacts.uniq!
 
+      @tags.flatten!
+      @tags.uniq!
+
       @artifacts = Artifact.all unless any_artifacts_given
 
       @artifacts = @artifacts.select do |artifact|
-        ( @open && !artifact.closed ) ||
-        ( @closed && artifact.closed )
+        ( ( @open && !artifact.closed ) ||
+          ( @closed && artifact.closed ) ) &&
+        ( @dependants || artifact.open_depends_on.size == 0 )
       end
 
+      @artifacts.sort!
+
       command = args.shift
-      command ||= :help
+      command ||= :list
 
       send( command.to_sym, *args )
     end
@@ -101,27 +127,35 @@ class Artifacts
       help_command :list, 'List artifacts'
     end
 
-    def self.default_list_filter( list )
-      list.select{|a|a.closed == nil && a.dependees.size == 0}
-    end
-
     def list
-      @artifacts.each do |artifact|
+      @limit = @artifacts.size if @limit > @artifacts.size
+      @limit.times do
+        artifact = @artifacts.shift
         puts artifact.send( @verbose ? :inspect : :to_s )
       end
+      puts "... #{@artifacts.size} more ..." unless @artifacts.empty?
     end
 
     def create( *args )
       artifact = Artifact.create( Artifacts.username, args.join(' ') )
       puts "Created artifact #{artifact.id}."
+      @artifacts = [artifact]
+      tag( *@tags )
     end
 
     def close
       @artifacts.each do |artifact|
         artifact.closed = Time.now
+        puts "Closed: #{artifact}"
+      end
+    end
+
+    def priority( priority )
+      priority = priority.to_i
+      @artifacts.each do |artifact|
+        artifact.priority = priority
+        puts "Priority changed to #{priority} for: #{artifact}"
       end
-      puts "Closed artifacts:"
-      list
     end
 
     def version
@@ -132,10 +166,11 @@ class Artifacts
 
     def depends( *args )
       args.shift if args.first == 'on' # optional syntax sugar
-      dependees = args.map{|id|Artifact[id.to_i]}
+      depends_on_list = args.map{|id|Artifact[id.to_i]}
       @artifacts.each do |artifact|
-        dependees.each do |dependee|
-          ArtifactArtifact.create( dependee, artifact )
+        depends_on_list.each do |depends_on|
+          ArtifactArtifact.create( artifact, depends_on )
+          puts "Artifact [#{artifact.id}] now depends on artifact [#{depends_on.id}]"
         end
       end
     end
@@ -145,6 +180,7 @@ class Artifacts
         tag = Tag.select{|n|n.name == tag_name}.first
         tag ||= Tag.create( tag_name )
         @artifacts.each do |artifact|
+          puts "Adding tag \"#{tag.name}\" to #{artifact}"
           artifact.add_tag( tag )
         end
       end
@@ -154,6 +190,7 @@ class Artifacts
       args.each do |tag_name|
         tag = Tag.select{|n|n.name == tag_name}.first
         @artifacts.each do |artifact|
+          puts "Removing tag \"#{tag.name}\" from #{artifact}"
           artifact.remove_tag( tag )
         end
       end

data/lib/artifacts/version.rb

@@ -1,3 +1,3 @@
 class Artifacts
-  VERSION = "2.0.3"
+  VERSION = "2.1.0"
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 2
+  - 1
   - 0
-  - 3
-  version: 2.0.3
+  version: 2.1.0
 platform: ruby
 authors: 
 - Clive Crous
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-16 00:00:00 +02:00
+date: 2011-02-17 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -114,7 +114,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 716821293
+      hash: -715623571
       segments: 
       - 0
       version: "0"
@@ -123,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 716821293
+      hash: -715623571
       segments: 
       - 0
       version: "0"