octo_merge 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ad3acce22d996c8dbd70fb5044771b918acfbfc
-  data.tar.gz: 476c5956699b9c2309dc30be9a3ce92574f7c03d
+  metadata.gz: a7b9a5819e11f475b2e7676343592c274f4a17ac
+  data.tar.gz: 4a5f04d70abfbacc7718ab84143e7e68000762b7
 SHA512:
-  metadata.gz: 0a05928307fd1f68f050267584d6c30503c79ef4eb63bc65bdda1d359c8156bbd97e44abe671fd20b8f131f2f7ccc200a926644ebb8af99e1a1cf108295991e4
-  data.tar.gz: 58e7f0dbef7ba0a1bd6c3892285271126df4ec9628f4c9b7be90a4332a73e6311ed8324a88546f071a422b0c13d1f8aee95696a1b8e61383fc4dc8485517acc3
+  metadata.gz: 96bb75ccc5a91b4b9009b0e9bbb6dc888b6a49ff59917c85bada93f6fcd9c293035b5b03a1d1d806715ca4cf5b2c0a44439a4a8abb05ab3563399038bd6d270d
+  data.tar.gz: 13ff3e0eaa02942eb16cd998257b4501b34fdb798b12edd029f5d44e5959e620ed0562ded954f4121c006485b2ef87aedd88d4fdd01407e2dee28e7557772686

data/README.md

@@ -28,6 +28,8 @@ Or install it yourself as:
 ## Examples
 
 ```
+# Within your shell
+
 octo-merge \
   --repo=rails/rails \
   --dir=~/Dev/Rails/rails \
@@ -80,7 +82,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/octo_merge. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/Deradon/octo_merge. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 
 ## License

data/exe/octo-merge

@@ -1,9 +1,19 @@
 #!/usr/bin/env ruby
 
-require 'optparse'
+require "optparse"
 require "octo_merge"
+require "yaml"
+
+options = if File.exist?(".octo-merge.yml")
+  body = File.read(".octo-merge.yml")
+  YAML.load(body)
+else
+  {}
+end
+
+# Symbolize keys
+options = options.inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo}
 
-options = {}
 OptionParser.new do |opts|
   opts.banner = "Usage: octo-merge [options]"
 
@@ -12,11 +22,11 @@ OptionParser.new do |opts|
   end
 
   opts.on("--dir=DIR", "Working directory (e.g.: '~/Dev/Rails/rails')") do |dir|
-    options[:working_directory] = File.expand_path(dir)
+    options[:dir] = dir
   end
 
   opts.on("--pull_requests=PULL_REQUESTS", "Pull requests (e.g.: '23,42,66')") do |pull_requests|
-    options[:pull_requests] = pull_requests.split(",")
+    options[:pull_requests] = pull_requests
   end
 
   opts.on("--login=login", "Login (Your GitHub username)") do |login|
@@ -28,15 +38,24 @@ OptionParser.new do |opts|
   end
 
   opts.on("--strategy=STRATEGY", "Merge strategy (e.g.: 'MergeWithoutRebase')") do |strategy|
-    options[:strategy] = Object.const_get("OctoMerge::#{strategy}")
+    options[:strategy] = strategy
   end
 
   opts.on('-h', '--help', 'Display this screen') do
     puts opts
     exit
   end
+
+  opts.on('-v', '--version', 'Display the version') do
+    puts OctoMerge::VERSION
+    exit
+  end
 end.parse!
 
+options[:dir] = File.expand_path(options[:dir])
+options[:pull_requests] = options[:pull_requests].split(",")
+options[:strategy] = Object.const_get("OctoMerge::#{options[:strategy]}")
+
 OctoMerge.configure do |config|
   config.login = options[:login]
   config.password = options[:password]
@@ -45,6 +64,6 @@ end
 OctoMerge.run(
   repo: options[:repo],
   pull_request_numbers: options[:pull_requests],
-  working_directory: options[:working_directory],
+  working_directory: options[:dir],
   strategy: options[:strategy]
 )

data/lib/octo_merge/version.rb

@@ -1,3 +1,3 @@
 module OctoMerge
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octo_merge
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Patrick Helm
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-29 00:00:00.000000000 Z
+date: 2016-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit