fixbraces 0.9.0 → 1.1.0

data/README.md

@@ -43,6 +43,14 @@ or a number of files:
 
 Run `fixbraces --help` for details.
 
+## Disclaimer
+
+I have tests, you can see them for yourself. The script works, but I'm
+aggressive about using version control, so if anything did get messed up I'm
+not left in an unrecoverable state.
+
+I suggest you do the same.
+
 ## Contributing
 
 1. Fork it

data/bin/fixbraces

@@ -2,6 +2,7 @@
 
 require "fixbraces"
 require "trollop"
+require "pathname"
 
 opts = Trollop::options do
   version "v#{Fixbraces::VERSION}"
@@ -32,5 +33,11 @@ ARGV.each do |f|
 end
 
 source_files.flatten.each do |f|
-  Fixbraces.process_file f
+  changed_file = Fixbraces.process_file f
+
+  if changed_file
+    path_name = Pathname.new changed_file
+    relative_path_name = path_name.relative_path_from Pathname.pwd
+    puts "Corrected: #{relative_path_name}"
+  end
 end

data/features/fixbraces.feature

@@ -6,6 +6,7 @@ Feature: The binary interface for fixbraces works
     Given a single source file called MasterViewController.m
     When I run `fixbraces MasterViewController.m`
     Then MasterViewController.m should be formatted correctly
+    Then the output should contain "MasterViewController.m"
     And the exit status should be 0
 
   Scenario: Run the app on a directory
@@ -18,5 +19,7 @@ Feature: The binary interface for fixbraces works
     Given an Xcode project
     When I run `"fixbraces FixbracesTestProject/*.m"`
     Then the .m files in that directory are changed
+    And the changed files should be listed
+    And there should not be any .h files listed
     And the .h files in that directory are unchanged
     And the exit status should be 0

data/features/step_definitions/fixbraces_steps.rb

@@ -38,6 +38,17 @@ Then /^the \.m files in that directory are changed$/ do
   expect(result).to eq ""
 end
 
+Then /^the changed files should be listed$/ do
+  step %(the output should contain "AppDelegate.m")
+  step %(the output should contain "DetailViewController.m")
+  step %(the output should contain "MasterViewController.m")
+  step %(the output should contain "main.m")
+end
+
+Then /^there should not be any .h files listed$/ do
+  step %(the output should not contain "AppDelegate.h")
+end
+
 Then /^the \.h files in that directory are unchanged$/ do
   base_dir = File.join @working_dir, "FixbracesTestProject"
   # We're looking fore unchanged files, so comparing them against the input not expected

data/fixbraces.gemspec

@@ -14,15 +14,15 @@ Xcode, and people I collaborate with are inconsistent about the placement
 of the opening brace. This corrects it for a file or a directory.
 DESC
   gem.summary       = "Puts the opening brace on the same line"
-  gem.homepage      = "https://github.com/abizern/fixbraces"
+  gem.homepage      = "http://abizern.org/fixbraces/"
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency "trollop"
-  gem.add_development_dependency "rspec"
-  gem.add_development_dependency "cucumber"
-  gem.add_development_dependency "aruba"
+  gem.add_dependency "trollop" , "~> 2.0"
+  gem.add_development_dependency "rspec", "~> 2.12"
+  gem.add_development_dependency "cucumber", "~> 1.2"
+  gem.add_development_dependency "aruba", "~> 0.5"
 end

data/lib/fixbraces/version.rb

@@ -1,3 +1,3 @@
 module Fixbraces
-  VERSION = "0.9.0"
+  VERSION = "1.1.0"
 end

data/lib/fixbraces.rb

@@ -3,23 +3,41 @@ require "tempfile"
 
 module Fixbraces
   def Fixbraces.fixbraces(text)
+    text_changed = false
+
     # Move the opening brace to the same line as the opening clause
-    partial_result = text.gsub(/\n[ \t]*\{[ \t]*$/, " {")
+    if text.gsub!(/\n[ \t]*\{[ \t]*$/, " {")
+      text_changed = true
+    end
 
     # If there are a pair of braces on their own line move them both up to the
     # same line as the opening line
-    partial_result.gsub(/\n[\s]*\{\}[\s]*$/, " {}")
+    if text.gsub!(/\n[\s]*\{\}[\s]*$/, " {}")
+      text_changed = true
+    end
+
+    text_changed ? text : nil
   end
 
   def Fixbraces.process_file(file)
-    temp_file = Tempfile.new "fixbraces"
+    corrected_text = ""
+
+    # Read in the text and pass it to the method that corrects it.
     File.open(file, "r") do |f|
       contents = f.read
-      new_contents = fixbraces contents
-      temp_file.write new_contents
+      corrected_text = fixbraces contents
     end
-    temp_file.close
-    FileUtils.cp temp_file.path, file
-    temp_file.unlink
+
+    if corrected_text
+      # Write the text to a temp file before overwriting the original file.
+      temp_file = Tempfile.new "fixbraces"
+      temp_file.write corrected_text
+      temp_file.close
+
+      FileUtils.cp temp_file.path, file
+    end
+
+    # Return the file path or nil if no changes were made
+    corrected_text ? file : nil
   end
 end

data/spec/fixbraces_spec.rb

@@ -27,8 +27,8 @@ describe Fixbraces do
     end
 
     it "doesn't change text that is correctly formatted" do
-      expect(Fixbraces.fixbraces corrected_split_braces).to eq corrected_split_braces
-      expect(Fixbraces.fixbraces corrected_paired_braces).to eq corrected_paired_braces
+      expect(Fixbraces.fixbraces corrected_split_braces).to be_nil
+      expect(Fixbraces.fixbraces corrected_paired_braces).to be_nil
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fixbraces
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -16,65 +16,65 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.12'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.5'
 description: ! 'I prefer my opening braces to be on the same line as the opening clause.
 
   Xcode, and people I collaborate with are inconsistent about the placement
@@ -153,7 +153,7 @@ files:
 - spec/fixtures/input/MasterViewController.h
 - spec/fixtures/input/MasterViewController.m
 - spec/fixtures/sample_text.rb
-homepage: https://github.com/abizern/fixbraces
+homepage: http://abizern.org/fixbraces/
 licenses: []
 post_install_message: 
 rdoc_options: []