octopando 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b952126463c2b3b7c494fb54d721c5fc824f896
-  data.tar.gz: 0fc534cf16c550f9257b1692fb869dc06746f826
+  metadata.gz: 82c8d0465410af7935745379781174ee9c550681
+  data.tar.gz: 9ce07a05ed370480a8663ea94399cd17f270134f
 SHA512:
-  metadata.gz: 0e608bd723a9ceef03add2fb99ad9ddc9a218dfb4df78abe3ab557fc206293204e0cff3bebf0bdb97180b280f7e13d170732d0bc96f4eca5963b3a989a798a7a
-  data.tar.gz: 700f38313bdae4bc251b5ac9a596c8889bb54b9eac380dd29e0c4337cf89f1d923063288983ede2eaae6212ac31d77f50fe7bea5a50040589d0b9463ac89fe7e
+  metadata.gz: 88d4ec227c379f484d6be50e98eb5cbeca6b2c7fcaaa04a14b3310abb94a7abef81cb2d76d30bb67ed55dd8c4ead610fc682c6fba29a2dccf90730bd8bc6235d
+  data.tar.gz: 37bef10e4ddf3e8e6410b94d223be6f1195837c3c33d2457e92801ff3637cd3918db530ccd0b84c71f79a32c23b80988d86af23e2826a9d434e8de4e25cbfcaa

data/CHANGELOG.md

@@ -0,0 +1,15 @@
+# Change Log
+All notable changes to this project will be documented in this file.
+This project adheres to [Semantic Versioning](http://semver.org/).
+
+## [0.2.1] - 2015-06-26
+### Added
+- Added link to jira in start action
+- Added Change log
+
+### Changed
+- Patch version bump
+
+### Fixed
+- No longer adds to the commit message if there is a Change-Id
+- No longer dies when the jira description is empty

data/lib/octopando/cli.rb

@@ -6,7 +6,7 @@ module Octopando
     desc "start", "Start some work"
     def start
       Octopando.jira.my_issues.each_with_index do |issue, index|
-        puts %Q{#{index+1} #{issue.key} - #{issue.summary}}
+        puts %Q{#{index+1} #{issue.key} - #{issue.summary}\n\t<https://instructure.atlassian.net/browse/#{issue.key}>}
       end
 
       ticket_item = ask ("Select a ticket")  { |q| q.echo = true }
@@ -15,6 +15,10 @@ module Octopando
 
     desc "prepare_commit_msg", "used for git hook"
     def prepare_commit_msg(message_file)
+      original_file_contents = File.read(message_file)
+      # we dont want to modify messages that have already been generated
+
+      return if original_file_contents.match('Change-Id: I')
       temp_message_file = "#{message_file}.tmp"
 
       git_branch = `git rev-parse --abbrev-ref HEAD`
@@ -24,14 +28,13 @@ module Octopando
       ticket_number = parsed_branch[:ticket]
 
       issue = Octopando.jira.Issue.find(ticket_number)
-
       message_template = []
 
       message_template << issue.summary if commit_type == 'issue'
       message_template << ''
-      message_template << WordWrap.ww(issue.description, 72)
+      message_template << WordWrap.ww(issue.description || '', 72)
       message_template << ''
-      message_template << "Ref: #{ticket_number}"
+      message_template << "Fixes #{ticket_number}"
       message_template << "# <https://instructure.atlassian.net/browse/#{ticket_number}>"
       message_template << ''
       message_template << 'Test Plan: '
@@ -40,7 +43,7 @@ module Octopando
       File.open(temp_message_file, 'w') do |file|
         file << message_template.join("\n")
         file << "\n"
-        file << File.read(message_file)
+        file << original_file_contents
       end
 
       File.rename(temp_message_file, message_file)

data/lib/octopando/version.rb

@@ -1,3 +1,3 @@
 module Octopando
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/octopando.gemspec

@@ -18,11 +18,11 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "git", "~> 1.2"
-  spec.add_dependency "jira-ruby", "~> 0.1"
-  spec.add_dependency "ruby-keychain", "~> 0.2"
-  spec.add_dependency "thor", "~> 0.19"
-  spec.add_dependency "word_wrap", "~> 1.0"
+  spec.add_runtime_dependency "git", "~> 1.2"
+  spec.add_runtime_dependency "jira-ruby", "~> 0.1"
+  spec.add_runtime_dependency "ruby-keychain", "~> 0.2"
+  spec.add_runtime_dependency "thor", "~> 0.19"
+  spec.add_runtime_dependency "word_wrap", "~> 1.0"
 
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopando
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - defektive
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-06-11 00:00:00.000000000 Z
+date: 2015-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -119,6 +119,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -152,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Makes your life easier