tpope-pickler 0.0.7 → 0.0.8

data/lib/pickler.rb

@@ -84,9 +84,8 @@ class Pickler
 
   def parser
     require 'cucumber'
-    require "cucumber/treetop_parser/feature_#@lang"
     Cucumber.load_language(@lang)
-    @parser ||= Cucumber::TreetopParser::FeatureParser.new
+    @parser ||= Cucumber::Parser::FeatureParser.new
   end
 
   def project_id
@@ -108,11 +107,15 @@ class Pickler
 
   def scenario_word
     parser
-    Cucumber.language['scenario']
+    Cucumber.keyword_hash['scenario']
+  end
+
+  def format
+    (config['format'] || :comment).to_sym
   end
 
   def local_features
-    Dir[features_path('**','*.feature')].map {|f|feature(f)}.select {|f|f.id}
+    Dir[features_path('**','*.feature')].map {|f|feature(f)}.select {|f|f.pushable?}
   end
 
   def scenario_features

data/lib/pickler/feature.rb

@@ -39,20 +39,20 @@ class Pickler
     def filename
       unless defined?(@filename)
         @filename = Dir[pickler.features_path("**","*.feature")].detect do |f|
-          File.read(f)[/#\s*#{URL_REGEX}/,1].to_i == @id
+          File.read(f)[/(?:#\s*|@[[:punct:]]?)#{URL_REGEX}/,1].to_i == @id
         end
       end
       @filename
     end
 
     def to_s
-      local_body || story.to_s
+      local_body || story.to_s(pickler.format)
     end
 
     def pull(default = nil)
       filename = filename() || pickler.features_path("#{default||id}.feature")
       story = story() # force the read into local_body before File.open below blows it away
-      File.open(filename,'w') {|f| f.puts story}
+      File.open(filename,'w') {|f| f.puts story.to_s(pickler.format)}
       @filename = filename
     end
 
@@ -63,10 +63,26 @@ class Pickler
       end
     end
 
+    def pushable?
+      id || local_body =~ %r{\A(?:#\s*|@[[:punct:]]?(?:http://www\.pivotaltracker\.com/story/new)?[[:punct:]]?(?:\s+@\S+)*\s*)\n[[:upper:]][[:lower:]]+:} ? true : false
+    end
+
     def push
-      return if story.to_s == local_body.to_s
-      story.to_s = local_body
-      story.save
+      body = local_body
+      return if story.to_s(pickler.format) == body.to_s
+      if story
+        story.to_s = body
+        story.save!
+      else
+        unless pushable?
+          raise Error, "To create a new story, make the first line an empty comment"
+        end
+        story = pickler.new_story
+        story.to_s = body
+        @story = story.save!
+        body.sub!(/\A(?:#.*\n)?/,"# #{story.url}\n")
+        File.open(filename,'w') {|f| f.write body}
+      end
     end
 
     def finish
@@ -81,7 +97,7 @@ class Pickler
 
     def id
       unless defined?(@id)
-        @id = if id = local_body.to_s[/#\s*#{URL_REGEX}/,1]
+        @id = if id = local_body.to_s[/(?:#\s*|@[[:punct:]]?)#{URL_REGEX}/,1]
                 id.to_i
               end
       end

data/lib/pickler/runner.rb

@@ -201,14 +201,28 @@ class Pickler
       banner_arguments "<story>"
       summary "Show details for a story"
 
+      on "--full", "default format" do
+        @format = :full
+      end
+
+      on "--raw", "same as the .feature" do
+        @format = :raw
+      end
+
       process do |*args|
         case args.size
         when 0
           puts "#{pickler.project_id} #{pickler.project.name}"
         when 1
-          story = pickler.story(args.first)
-          paginated_output do
-            puts_full story
+          feature = pickler.feature(args.first)
+          story = feature.story
+          case @format
+          when :raw
+            puts feature.story.to_s(pickler.format) if feature.story
+          else
+            paginated_output do
+              puts_full feature.story
+            end
           end
         else
           too_many
@@ -284,7 +298,8 @@ class Pickler
       summary "Upload stories"
       description <<-EOF
 Upload the given story or all features with a tracker url in a comment on the
-first line.
+first line.  Features with a blank comment in the first line will created as
+new stories.
       EOF
 
       process do |*args|

data/lib/pickler/tracker.rb

@@ -1,10 +1,11 @@
 require 'date'
+require 'cgi'
 
 class Pickler
   class Tracker
 
     ADDRESS = 'www.pivotaltracker.com'
-    BASE_PATH = '/services/v1'
+    BASE_PATH = '/services/v2'
     SEARCH_KEYS = %w(label type state requester owner mywork id includedone)
 
     class Error < Pickler::Error; end
@@ -50,23 +51,19 @@ class Pickler
     def request_xml(method, path, *args)
       response = request(method,path,*args)
       raise response.inspect if response["Content-type"].split(/; */).first != "application/xml"
-      Hash.from_xml(response.body)["response"]
+      hash = Hash.from_xml(response.body)
+      if hash["message"] && (response.code.to_i >= 400 || hash["success"] == "false")
+        raise Error, hash["message"], caller
+      end
+      hash
     end
 
     def get_xml(path)
-      response = request_xml(:get, path)
-      unless response["success"] == "true"
-        if response["message"]
-          raise Error, response["message"], caller
-        else
-          raise "#{path}: #{response.inspect}"
-        end
-      end
-      response
+      request_xml(:get, path)
     end
 
     def project(id)
-      Project.new(self,get_xml("/projects/#{id}")["project"].merge("id" => id.to_i))
+      Project.new(self,get_xml("/projects/#{id}")["project"])
     end
 
     class Abstract
@@ -86,7 +83,10 @@ class Pickler
 
       def self.date_reader(*methods)
         methods.each do |method|
-          define_method(method) { value = @attributes[method.to_s] and Date.parse(value) }
+          define_method(method) do
+            value = @attributes[method.to_s]
+            value.kind_of?(String) ? Date.parse(value) : value
+          end
         end
       end
 
@@ -96,7 +96,10 @@ class Pickler
           define_method("#{method}=") { |v| @attributes[method.to_s] = v }
         end
       end
-      reader :id
+
+      def id
+        id = @attributes['id'] and Integer(id)
+      end
 
       def to_xml(options = nil)
         @attributes.to_xml({:dasherize => false, :root => self.class.name.split('::').last.downcase}.merge(options||{}))

data/lib/pickler/tracker/iteration.rb

@@ -2,13 +2,20 @@ class Pickler
   class Tracker
     class Iteration < Abstract
       attr_reader :project
-      date_reader :start, :finish
 
       def initialize(project, attributes = {})
         @project = project
         super(attributes)
       end
 
+      def start
+        Date.parse(@attributes['start'].to_s)
+      end
+
+      def finish
+        Date.parse(@attributes['finish'].to_s)
+      end
+
       def number
         @attributes['number'].to_i
       end
@@ -23,7 +30,7 @@ class Pickler
       end
 
       def succ
-        self.class.new(project, 'number' => number.succ.to_s, 'start' => @attributes['finish'], 'finish' => (finish + (finish - start)).strftime("%b %d, %Y"))
+        self.class.new(project, 'number' => number.succ.to_s, 'start' => @attributes['finish'], 'finish' => (finish + (finish - start)))
       end
 
       def inspect

data/lib/pickler/tracker/note.rb

@@ -3,7 +3,11 @@ class Pickler
     class Note < Abstract
       attr_reader :story
       reader :text, :author
-      date_reader :date
+      date_reader :noted_at
+
+      def date
+        noted_at && Date.new(noted_at.year, noted_at.mon, noted_at.day)
+      end
 
       def initialize(story, attributes = {})
         @story = story

data/lib/pickler/tracker/project.rb

@@ -20,7 +20,7 @@ class Pickler
         path = "/projects/#{id}/stories"
         path << "?filter=#{CGI.escape(filter)}" if filter
         response = tracker.get_xml(path)
-        [response["stories"]["story"]].flatten.compact.map {|s| Story.new(self,s)}
+        [response["stories"]].flatten.compact.map {|s| Story.new(self,s)}
       end
 
       def new_story(attributes = {}, &block)

data/lib/pickler/tracker/story.rb

@@ -5,7 +5,7 @@ class Pickler
       TYPES = %w(bug feature chore release)
       STATES = %w(unscheduled unstarted started finished delivered rejected accepted)
 
-      attr_reader :project, :iteration, :labels
+      attr_reader :project, :labels
       reader :url
       date_reader :created_at, :accepted_at, :deadline
       accessor :current_state, :name, :description, :owned_by, :requested_by, :story_type
@@ -17,6 +17,13 @@ class Pickler
         @labels = normalize_labels(@attributes["labels"])
       end
 
+      def iteration
+        unless current_state == 'unscheduled' || defined?(@iteration)
+          @iteration = project.stories(:id => id, :includedone => true).first.iteration
+        end
+        @iteration
+      end
+
       def labels=(value)
         @labels = normalize_labels(value)
       end
@@ -72,16 +79,28 @@ class Pickler
         project.tracker
       end
 
-      def to_s
-        to_s = "# #{url}\n#{story_type.capitalize}: #{name}\n"
+      def to_s(format = :comment)
+        to_s = "#{header(format)}\n#{story_type.capitalize}: #{name}\n"
         description_lines.each do |line|
           to_s << "  #{line}".rstrip << "\n"
         end
         to_s
       end
 
+      def header(format = :comment)
+        case format
+        when :tag
+          "@#{url}#{labels.map {|l| " @#{l.tr('_,',' _')}"}.join}"
+        else
+          "# #{url}"
+        end
+      end
+
       def to_s=(body)
-        body = body.sub(/\A# .*\n/,'')
+        if body =~ /\A@https?\b\S*(\s+@\S+)*\s*$/
+          self.labels = body[/\A@.*/].split(/\s+/)[1..-1].map {|l| l[1..-1].tr(' _','_,')}
+        end
+        body = body.sub(/\A(?:[@#].*\n)+/,'')
         if body =~ /\A(\w+): (.*)/
           self.story_type = $1.downcase
           self.name = $2
@@ -136,7 +155,7 @@ class Pickler
       def destroy
         if id
           response = tracker.request_xml(:delete, "/projects/#{project.id}/stories/#{id}", "")
-          raise Error, response["message"], caller if response["success"] != "true"
+          raise Error, response["message"], caller if response["message"]
           @attributes["id"] = nil
           self
         end
@@ -148,7 +167,7 @@ class Pickler
 
       def save
         response = tracker.request_xml(id ? :put : :post,  resource_url, to_xml(false))
-        if response["success"] == "true"
+        if response["story"]
           initialize(project, response["story"])
           true
         else
@@ -156,6 +175,14 @@ class Pickler
         end
       end
 
+      def save!
+        errors = save
+        if errors != true
+          raise Pickler::Tracker::Error, Array(error).join("\n"), caller
+        end
+        self
+      end
+
       private
       def normalize_labels(value)
         Array(value).join(", ").strip.split(/\s*,\s*/)

data/pickler.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name                = "pickler"
-  s.version             = "0.0.7"
+  s.version             = "0.0.8"
 
   s.summary             = "PIvotal traCKer Liaison to cucumbER"
   s.description         = "Synchronize between Cucumber and Pivotal Tracker"
@@ -24,5 +24,5 @@ Gem::Specification.new do |s|
     "lib/pickler/tracker/note.rb"
   ]
   s.add_dependency("activesupport", [">= 2.0.0"])
-  s.add_dependency("cucumber", [">= 0.1.9"])
+  s.add_dependency("cucumber", [">= 0.2.0"])
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tpope-pickler
 version: !ruby/object:Gem::Version 
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors: 
 - Tim Pope
@@ -9,11 +9,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-05 00:00:00 -08:00
+date: 2009-03-21 00:00:00 -07:00
 default_executable: pickler
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -23,12 +24,13 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: cucumber
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.1.9
+        version: 0.2.0
     version: 
 description: Synchronize between Cucumber and Pivotal Tracker
 email: ruby@tpope.info