tracker-git 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73a17722e09a98741a2b270a4c3cb222a6b7ea02
-  data.tar.gz: 85e5c5168e6002be4cc8f486918d101bd7561eb1
+  metadata.gz: b0159ecbcf1438499f08844bc763b007dc2fed85
+  data.tar.gz: c592e5b85653233b00d023e35c7a73db7ebda898
 SHA512:
-  metadata.gz: 83d79a0250ade8e2fb51c72b449b214a19219edacdcfe55fa7b8c56d2ccee4beda374acebd4ce57ab424eb6af40e0809b6d9068456fe4bac80687d5ffcffe080
-  data.tar.gz: e739c358d8a5fcf378cbb7191ee01965a64415a8792981b25aab3898f8632e8411f9a416f3af76883f059edda2d4ef65d3dd083825b3e49bddeb421233e2f692
+  metadata.gz: b90e9a2f44674f9220a32040a58d1131a612587071e20c82fc7fc450daefae15b201d7a77962dbf70562c0af02b98e03a1c72f9afc1c1b92a977a3f58e9de9ee
+  data.tar.gz: 58953a7a352efb996029af6aabf36176d968da59c351ac9b9e5738f7c3fc53a7f34b73faf0dc5b2b07a9af1804ccccafe6b22a876aa02ca126e9f4c49d48a28b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tracker-git (0.0.4)
+    tracker-git (0.0.5)
       pivotal-tracker (>= 0.5.10)
 
 GEM

data/README.md

@@ -1,8 +1,8 @@
 # Tracker::Git
 
-Update Pivotal Tracker depending on your local Git repository. 
+Update Pivotal Tracker depending on your local Git repository.
 
-This gem finds all finished stories and bugs and if it finds the story id in a Git commit, marks that story as delivery. 
+This gem finds all finished stories and bugs and if it finds the story id in a Git commit, marks that story as delivery.
 
 This has proved useful as part of a 'deploy to staging' strategy. If you automatically deploy to a staging environment after a successful continuous integration build, and want to update a story from 'finished' to 'delivered', then this Gem is for you.
 
@@ -36,7 +36,7 @@ delivered.
     export TRACKER_PROJECT_ID=123456
     export TRACKER_TOKEN=abc123
     tracker
-    
+
 You can also pass the project id and token in as parameters
 
     tracker 123456 abc123
@@ -44,6 +44,12 @@ You can also pass the project id and token in as parameters
 Optionally you can specify a git branch to search for completed story IDs as
 the third command line argument or with the GIT\_BRANCH environment variable.
 
+If you want to add a label (tag) to the story marked as delivered, you
+can use the `--label` flag:
+
+    tracker --label THE_LABEL
+
+
 ## Known Issues
 
 - [Restarting stories](https://github.com/robb1e/tracker-git/issues/1)

data/bin/tracker

@@ -15,6 +15,10 @@ OptionParser.new do |opts|
   opts.on("-l", "--label LABEL", "Add a label to a story marked as deployed") do |label|
     options[:label] = label if label =~ /[^[:space:]]/
   end
+
+  opts.on("-a", "--accept", "Changes status from delivered to accepted") do |accept|
+    options[:accept] = true
+  end
 end.parse!
 
 project_id, tracker_token, git_branch = \
@@ -41,3 +45,4 @@ project = Tracker::Project.new(tracker_token, project_id)
 git = Tracker::Git.new
 deliverer = Tracker::Deliverer.new(project, git)
 deliverer.mark_as_delivered(git_branch, options[:label])
+deliverer.mark_as_accepted(git_branch, options[:label]) if options[:accept]

data/lib/tracker-git/deliverer.rb

@@ -6,16 +6,23 @@ module Tracker
       @git = git
     end
 
-    def mark_as_delivered(branch = nil, label = nil)
+    def mark_as_delivered(branch = nil, label = nil, use_accepted = false)
       options = {}
       options[:branch] = branch if branch
 
-      project.finished.each do |story|
+      collection = use_accepted ? project.delivered : project.finished
+
+      collection.each do |story|
         if git.contains?(story.id, options)
-          project.deliver(story)
+          project.accept(story) if use_accepted
+          project.deliver(story) unless use_accepted
           project.add_label(story, label) if label
         end
       end
     end
+
+    def mark_as_accepted(branch = nil, label = nil)
+      mark_as_delivered(branch, label, true)
+    end
   end
 end

data/lib/tracker-git/project.rb

@@ -17,10 +17,18 @@ module Tracker
       _project.stories.all(state: "finished", story_type: ['bug', 'feature'])
     end
 
+    def delivered
+      _project.stories.all(state: "delivered", story_type: ['bug', 'feature'])
+    end
+
     def deliver(story)
       story.update(current_state: "delivered")
     end
 
+    def accept(story)
+      story.update(current_state: "accepted")
+    end
+
     def add_label(story, label)
       labels = (story.labels || "").split(",")
       labels << label

data/lib/tracker-git/version.rb

@@ -1,3 +1,3 @@
 module Tracker
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: tracker-git
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Robbie Clutton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-20 00:00:00.000000000 Z
+date: 2014-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pivotal-tracker
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.5.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.5.10
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: 'Tracker integration: Update Tracker based on current Git repo.'
@@ -74,9 +74,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - Guardfile
@@ -104,17 +104,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Tracker integration.