octo_merge 0.3.0 → 0.4.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: d04807b8aa3b52cc6ba26b896fd4c293a6ce2b15
4
- data.tar.gz: f61a9911d245112f1e2db1e324fd32d110a29f6e
3
+ metadata.gz: adea7dbf2172dd7c03e8a0339a7daace935e22cd
4
+ data.tar.gz: df5af4c44bb7c6f60ced0bcf0705e4dbb38ca9b3
5
5
  SHA512:
6
- metadata.gz: be5dcf239a003519014f413e5024ecb5d9df799d736df2394de0bf428e90481fcb4f86e49c002d6339808fd99166c2d275a6713eb65fa679475818b74cec8772
7
- data.tar.gz: 8f3534fe23b033a617f23fbffd6d40f5d781dc98ba6fb7404f05dace046328b16b526101028ede993d142495f09969080044b65d4fc3d831662c4a24a5f565be
6
+ metadata.gz: e8a5c1510c9f5448f86f3abdea95c0ab7694a5b1a180be542ff73c946c0142499b36522142ca87a5d347ac34736cb12aafac28d0a9a758cce8a1a45d57b8884d
7
+ data.tar.gz: 1ab92d833992e832187d4fcc4dc1d578b1f6fc777dfa53991a5d052779c848f7c3ecc7aa0a0ba0fe1df05c0909cbe336997b7ef51d3e113eab96169d3744e7b4
data/exe/octo-merge CHANGED
@@ -4,7 +4,10 @@ require "optparse"
4
4
  require "octo_merge"
5
5
  require "yaml"
6
6
 
7
- options = {}
7
+ options = {
8
+ dir: ".",
9
+ strategy: "MergeWithoutRebase"
10
+ }
8
11
 
9
12
  user_config_path = File.expand_path("~/.octo-merge.yml")
10
13
 
@@ -73,6 +76,7 @@ OctoMerge.configure do |config|
73
76
  end
74
77
 
75
78
  options[:dir] = File.expand_path(options[:dir])
79
+
76
80
  options[:strategy] = Object.const_get("OctoMerge::#{options[:strategy]}")
77
81
 
78
82
  options[:pull_requests] = OctoMerge::InteractivePullRequests.get(options) if options[:interactive]
@@ -1,3 +1,3 @@
1
1
  module OctoMerge
2
- VERSION = "0.3.0"
2
+ VERSION = "0.4.0"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: octo_merge
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.0
4
+ version: 0.4.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Patrick Helm
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2016-03-05 00:00:00.000000000 Z
11
+ date: 2016-03-06 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: octokit