changelog_merger 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d694b8d666a0cce2fb647156a4db7834009b66d
-  data.tar.gz: f90d61591bd10f80bf614c6a8cf13ccc9307a829
+  metadata.gz: b5c2b1b796cc3f9c1b7ae27e53a42a76285e8c83
+  data.tar.gz: 595f988faa2cb3007298b88343ed486b1afa6c59
 SHA512:
-  metadata.gz: ae1ad15e751bea3969dba32118c46037c53c86ec5067204d95bd281c736d4b2e66515a215c5fb26ac91f0e667c8722d2f90db64dd44ffc33f55eda3d46e8655a
-  data.tar.gz: 60626c47f39017a6d5f56624fb3bef4cdab271ceb8132ea8184980cf0f405b7fb9baf519c06d435a1e81a8a886fe35319027a16bb06f858fc94cf16e297bb10a
+  metadata.gz: a3fad29b448c857ee6e9ff3afbd2ebb557cd5929ea309e604d10114f90c0c114c3794882975fd4abbd619cac261a5a315d2410118a0abb905b9889c69d1dbc80
+  data.tar.gz: f4533e7d3496a77e74298201a8b082d9e0160354ac1a6262a24b1c584ab8a5004a7971454c93469269fb8613fa622d9bd8d3eea2f1505ca8d846fa0aba4f9411

data/lib/changelog_merger/version.rb

@@ -1,3 +1,3 @@
 module ChangelogMerger
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/lib/changelog_merger.rb

@@ -7,20 +7,23 @@ module ChangelogMerger
   class Merger
     def initialize
       @options = Parser.parse_options
-
     end
 
     def run_generator
-      if @options[:run_wo_pr]
-        generate_change_log
-        execute_line("open #{@options[:output]}")
-      else
-        go_to_work_dir
-        clone_repo_and_cd
-        check_existing_changelog_file
-        generate_pr_message
-        generate_change_log
-        add_commit_push
+      begin
+        if @options[:run_wo_pr]
+          generate_change_log
+          execute_line("open #{@options[:output]}")
+        else
+          go_to_work_dir
+          clone_repo_and_cd
+          check_existing_changelog_file
+          generate_pr_message
+          generate_change_log
+          add_commit_push
+        end
+      rescue
+        execute_line('git push skywinder :add-change-log-file && git checkout master && git branch -D add-change-log-file')
       end
     end
 
@@ -49,19 +52,19 @@ Hi, as I can see, you are carefully fill tags and labels for issues in your repo
 For such cases I create a [github_changelog_generator](https://github.com/skywinder/github-changelog-generator), that generate change log file based on **tags**, **issues** and merged **pull requests** from :octocat: Issue Tracker.
 
 This PR add change log file to your repo (generated by this script).
-You can look, how it's look like here: [Change Log](https://github.com/skywinder/#{@options[:project]}/blob/add-change-log-file/#{@options[:output]})
+You can check, how it is look like here: [Change Log](https://github.com/skywinder/#{@options[:project]}/blob/add-change-log-file/#{@options[:output]})
 
 Some essential features, that has this script:
 
--  it **exclude** not-related to changelog issues (any issue, that has label `question` `duplicate` `invalid` `wontfix` )
+-  it **exclude** not-related to changelog issues (any issue, that has label \`question\` \`duplicate\` \`invalid\` \`wontfix\` )
 - Distinguish issues **according labels**:
-    - Merged pull requests (all `merged` pull-requests)
-    - Bug fixes (by label `bug` in issue)
-    - Enhancements (by label `enhancement` in issue)
-    -   Issues (closed issues `w/o any labels`)
+    - Merged pull requests (all \`merged\` pull-requests)
+    - Bug fixes (by label \`bug\` in issue)
+    - Enhancements (by label \`enhancement\` in issue)
+    -   Issues (closed issues \`w/o any labels\`)
 - Generate neat Change Log file according basic [change log guidelines](http://keepachangelog.com).
 
-You can easily update this file in future by simply run script: `github_changelog_generator #{@options[:repo]}` in your repo folder and it make your Change Log file up-to-date again!
+You can easily update this file in future by simply run script: \`github_changelog_generator #{@options[:repo]}\` in your repo folder and it make your Change Log file up-to-date again!
 
 Hope you find this commit as useful. :wink:"
 
@@ -92,7 +95,7 @@ I know that you already has #{@options[:chagelog_exists]} file but give this scr
         execute_line("rm -rf #{@options[:project]}")
       end
       execute_line("hub clone #{@options[:repo]}")
-      Dir.chdir("./#{@options[:project]}")
+      @options[:dry_run] || Dir.chdir("./#{@options[:project]}")
       puts "Go to #{Dir.pwd}"
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: changelog_merger
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Petr Korolev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-19 00:00:00.000000000 Z
+date: 2015-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -134,8 +134,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Script to merge change logs to github repo
 test_files: []
+has_rdoc: