git_reflow 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a03428bd10395a06f13dba78ed2d3c0f5a44d365
-  data.tar.gz: 39ccbe0eba5a4bc2d1c8dd4f773abdaf2a4494e3
+  metadata.gz: bb81aa92d38e6c5b348ce8838f4c387ddcd93acb
+  data.tar.gz: d9e9551ff37a67dec4593a368f8fcd72080ad1c9
 SHA512:
-  metadata.gz: cf391753fa8dce7bbc246b1310e83b7a30407462b69bb5a99e675b07adf3ca5ecf5a54b50e425db533a8d97f0b9b889c263010fbb60e3b2dc23da1e3a2cd6025
-  data.tar.gz: dcfad07027cc0a827a62b614c2a8b1f201df578a46b8c8a710758c3103dffa1bfb4276d30908ab091bb55449bbbbe33bd9b85a6a0d1bdc7d069fcec868373b3f
+  metadata.gz: dede713a4bd84a1060afaf57de37a3edd797a64708c3e7e2ee9cfe3705ea28490f554723bfeb01b541da0becc239ad17eeeb6039d230361c3f53798a721d5c19
+  data.tar.gz: 8049748445af1ef7fe6b5d9c214d96aa06194ed430d32da8fcdb26c95aa107374b52a14da6f757aac59b1c165855622d715059bddea90973a7097ca5c698dee7

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    git_reflow (0.6.5)
-      colorize (= 0.6.0)
+    git_reflow (0.6.6)
+      colorize (>= 0.7.0)
       github_api (= 0.12.3)
       gli (= 2.12.2)
       highline
@@ -22,7 +22,7 @@ GEM
       columnize (= 0.9.0)
       rb-readline (= 0.5.2)
     coderay (1.1.0)
-    colorize (0.6.0)
+    colorize (0.7.7)
     columnize (0.9.0)
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
@@ -115,4 +115,4 @@ DEPENDENCIES
   wwtd (= 0.7.0)
 
 BUNDLED WITH
-   1.10.5
+   1.10.6

data/circle.yml

@@ -1,16 +1,16 @@
 dependencies:
   pre:
     - rvm install 2.0.0
-    - rvm install 2.1.6
-    - rvm install 2.2.2
+    - rvm install 2.1.7
+    - rvm install 2.2.3
 
   override:
-    - 'rvm-exec 2.0.0-p643 bundle install'
-    - 'rvm-exec 2.1.6 bundle install'
-    - 'rvm-exec 2.2.2 bundle install'
+    - 'rvm-exec 2.0.0-p647 bundle install'
+    - 'rvm-exec 2.1.7 bundle install'
+    - 'rvm-exec 2.2.3 bundle install'
 
 test:
   override:
-    - 'rvm-exec 2.0.0-p643 bundle exec rake'
-    - 'rvm-exec 2.1.6 bundle exec rake'
-    - 'rvm-exec 2.2.2 bundle exec rake'
+    - 'rvm-exec 2.0.0-p647 bundle exec rake'
+    - 'rvm-exec 2.1.7 bundle exec rake'
+    - 'rvm-exec 2.2.3 bundle exec rake'

data/git_reflow.gemspec

@@ -28,7 +28,7 @@ spec = Gem::Specification.new do |s|
   s.add_development_dependency('webmock')
   s.add_development_dependency('wwtd', '0.7.0')
 
-  s.add_dependency('colorize', '0.6.0')
+  s.add_dependency('colorize', '>= 0.7.0')
   s.add_dependency('gli', '2.12.2')
   s.add_dependency('highline')
   s.add_dependency('httpclient')

data/lib/git_reflow/commands/review.rb

@@ -26,7 +26,7 @@ command :review do |c|
 
       GitReflow.run("#{default_editor} #{pull_request_msg_file}", with_system: true)
 
-      pr_msg = File.open(pull_request_msg_file).each_line.map(&:strip).to_a
+      pr_msg = File.read(pull_request_msg_file).split(/[\r\n]|\r\n/).map(&:strip)
       title  = pr_msg.shift
 
       File.delete(pull_request_msg_file)

data/lib/git_reflow/os_detector.rb

@@ -0,0 +1,23 @@
+# Thanks to http://stackoverflow.com/questions/170956/how-can-i-find-which-operating-system-my-ruby-program-is-running-on
+# and to Thoughtbot: https://github.com/thoughtbot/cocaine/blob/master/lib/cocaine/os_detector.rb
+module GitReflow
+  class OSDetector
+    def windows?
+      (/cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM) != nil
+    end
+
+    def mac?
+      (/darwin/ =~ RUBY_PLATFORM) != nil
+    end
+
+    def unix?
+      !OS.windows?
+    end
+
+    def linux?
+      OS.unix? and not OS.mac?
+    end
+  end
+
+  OS = OSDetector.new
+end

data/lib/git_reflow/sandbox.rb

@@ -15,11 +15,11 @@ module GitReflow
       if options[:with_system] == true
         system(command)
       elsif options[:loud] == true
-        output = `#{command}`
+        output = %x{#{command}}
         puts output
         output
       else
-        `#{command}`
+        %x{#{command}}
       end
     end
 
@@ -39,18 +39,17 @@ module GitReflow
 
     # WARNING: this currently only supports OS X and UBUNTU
     def ask_to_open_in_browser(url)
-      if RUBY_PLATFORM =~ /darwin|linux/i
+      if OS.linux?
         open_in_browser = ask "Would you like to open it in your browser? "
         if open_in_browser =~ /^y/i
-          if RUBY_PLATFORM =~ /darwin/i
-            # OS X
+          if OS.mac?
             run "open #{url}"
           else
-            # Ubuntu
             run "xdg-open #{url}"
           end
         end
       end
     end
+
   end
 end

data/lib/git_reflow/version.rb

@@ -1,3 +1,3 @@
 module GitReflow
-  VERSION = "0.6.5"
+  VERSION = "0.6.6"
 end

data/lib/git_reflow.rb

@@ -11,6 +11,7 @@ require 'git_reflow/config'
 require 'git_reflow/git_server'
 require 'git_reflow/git_server/git_hub'
 require 'git_reflow/git_server/bit_bucket'
+require 'git_reflow/os_detector'
 require 'git_reflow/sandbox'
 require 'git_reflow/git_helpers'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_reflow
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors:
 - Valentino Stoll
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-31 00:00:00.000000000 Z
+date: 2015-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
@@ -128,16 +128,16 @@ dependencies:
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
@@ -256,6 +256,7 @@ files:
 - lib/git_reflow/git_server/base.rb
 - lib/git_reflow/git_server/bit_bucket.rb
 - lib/git_reflow/git_server/git_hub.rb
+- lib/git_reflow/os_detector.rb
 - lib/git_reflow/sandbox.rb
 - lib/git_reflow/version.rb
 - spec/fixtures/git/git_config