patchy 1.0.0b3 → 1.0.0b4

data/README.md

@@ -50,7 +50,7 @@ commit message. Patchy shows you which commands it runs and asks you to approve
 the output of certain critical commands before moving on.
 
 I encourage you to take a look at the source code (in `bin/patchy`). It's only
-61 lines "long" and helps you understand what exactly Patchy does for you.
+62 lines "long" and helps you understand what exactly Patchy does for you.
 
 ## Copyright
 

data/bin/patchy

@@ -2,20 +2,19 @@
 
 def run(command)
   headline = "Running: #{command}"
+  puts
   puts headline
   puts '=' * headline.length
   `#{command}`
-  puts
 end
 
 def run_and_approve(command)
-  run(command)
-  print('Approve? (Y/n) ')
+  puts run(command)
+  puts('Approve? (Y/n) ')
   input = gets
   if input != $/ && input.chomp.downcase != 'y'
     exit
   end
-  puts
 end
 
 def current_branch
@@ -32,12 +31,14 @@ if ARGV[0] =~ /^\d+$/
   unless base_branch == current_branch
     run("git checkout #{base_branch}")
   end
-  run("git pull")
+  puts run("git pull")
   run("git checkout -b #{ticket}")
   if base_branch == 'master'
-    run("bin/rails new railties/tmp/ticket_#{ticket} --dev")
-    File.open("railties/tmp/ticket_#{ticket}/Gemfile", 'r+') do |f|
-      f.write(f.read.sub(/gem 'rails', :path => '(.+)'/, "gem 'rails', :git => '\\1', :branch => '#{ticket}'"))
+    puts run("bin/rails new railties/tmp/ticket_#{ticket} --dev")
+    gemfile = "railties/tmp/ticket_#{ticket}/Gemfile"
+    gemfile_data = File.read(gemfile)
+    File.open(gemfile, 'w') do |f|
+      f.write(gemfile_data.sub(/gem 'rails', :path => '(.+)'/, "gem 'rails', :git => '\\1', :branch => '#{ticket}'"))
     end
   end
 else
@@ -46,7 +47,7 @@ else
 
   ARGV.clear
 
-  run("git commit -m \"#{message} [##{ticket} state:committed]\"")
+  puts run("git commit -m \"#{message} [##{ticket} state:committed]\"")
   run("git checkout #{base_branch}")
   run_and_approve("git pull")
   run("git checkout #{ticket}")

data/lib/patchy/version.rb

@@ -1,3 +1,3 @@
 module Patchy
-  VERSION = '1.0.0b3'
+  VERSION = '1.0.0b4'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: patchy
 version: !ruby/object:Gem::Version 
-  hash: 415574163
+  hash: 415574160
   prerelease: true
   segments: 
   - 1
   - 0
-  - 0b3
-  version: 1.0.0b3
+  - 0b4
+  version: 1.0.0b4
 platform: ruby
 authors: 
 - David Trasbo
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-30 00:00:00 +02:00
+date: 2010-07-26 00:00:00 +02:00
 default_executable: 
 dependencies: []