ruby-beautify 0.97.0 → 0.97.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45c73195863804f127d9481a07ec33676821e4d1
-  data.tar.gz: c1eaef1e3e7b2736d6f9a6272cd428636d0ef28a
+  metadata.gz: 845edab077c5c5bf51a6e33fa1cce9d9337c70b4
+  data.tar.gz: 334487716f67201c629c3ce0ee46dafd21a8943b
 SHA512:
-  metadata.gz: 9370b94027a54f3b6911f818e8847b0c49c957cadfe2b6c73b049f493a24ab90dd1de91a61f48da952acc1001216fbcf8aa2721ef467c6478dfea8273d7713c7
-  data.tar.gz: 98f2d051bebff05ae8dce225ce5e44f3a2cef4dacf89dab2327ae094bae6cea7417062e0a476e91eb3d707a845a5aa527dc9e9d555251ce9e21c29045015bb4d
+  metadata.gz: 9cd313b20304d0b0247015da7cfb8842a2a2bacf34ace4c2cca3256eb406b0022bb6be65c3cf95b4675989616a3e4b7e14ae8d790aed837c354959c91cf3c2c1
+  data.tar.gz: 4bf21cb165f737d4d97c4778bac5fb942b9cd4f519e34f691932b58b05f00aa941fd80b61ab1ec05c935026e0f79f5bff754a21462972b6601f1ebd02c4a039a

data/README.md

@@ -1,9 +1,4 @@
-# Ruby Beautify
-**Master** [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/erniebrodeur/ruby-beautify) [![Build Status](https://travis-ci.org/erniebrodeur/ruby-beautify.png?branch=master)](https://travis-ci.org/erniebrodeur/ruby-beautify) [![Dependency Status](https://gemnasium.com/erniebrodeur/ruby-beautify.png)](https://gemnasium.com/erniebrodeur/ruby-beautify)
-
-**Development** [![Build Status](https://travis-ci.org/erniebrodeur/ruby-beautify.png?branch=dev)](https://travis-ci.org/erniebrodeur/ruby-beautify)
-
-[![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/erniebrodeur/ruby-beautify?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+# Ruby Beautify [![Build Status](https://travis-ci.org/erniebrodeur/ruby-beautify.png?branch=master)](https://travis-ci.org/erniebrodeur/ruby-beautify) [![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/erniebrodeur/ruby-beautify?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 This gem provides a cli binary named 'ruby-beautify' that will pretty up ruby code.
 
@@ -51,6 +46,19 @@ You can over write files in place, this is useful for doing an entire directory
 
   `ruby-beautify --overwrite **/*.rb`
 
+## Configuration file
+
+It can use a configuration file like some of the other ruby projects out there.  The config file consists of each argument on a new line.  Something like this:
+
+```
+--spaces
+--ident_count=2
+```
+
+Note, you'll have to add the equal sign between value and argument (tricky bit, that).
+
+Placing this into a `.ruby-beautify` anywhere in your tree (like git) will work.  This allows you to put it at the root of a project and have it change the defaults anywhere in the project.
+
 ## Bugs
 
 Please feel free to open issues, I am actively working on this project again, thanks entirely to the ripper gem.
@@ -60,6 +68,7 @@ The gaps are getting smaller.  I think we have most of the basic ruby use cases
 ## Todo
 
 * Add vim style comment hinting.
+* add specs/pipe testing (epic).
 * remove the link to rbeautify (by 1.0).
 
 Longer term I'd like to do some more to assignment, line wrapping, and spacing in/around keywords.

data/WHATSNEW.md

@@ -1,3 +1,7 @@
+## 0.97.1
+* Now with more config file flavor! (check the [README.md]).
+* All tests green.
+
 ## 0.97.0
 * Split up the spec into usage scenarios, easier to contribut too.
 * Lots of refactoring.

data/bin/rbeautify

@@ -3,6 +3,7 @@ require 'optparse'
 require 'ruby-beautify'
 
 include RubyBeautify
+my_argv = config_argv
 
 Options = OptionParser.new do |opts|
 	opts.on("-V", "--version", "Print version") { |version| puts RBeautify::VERSION;exit 0}
@@ -12,7 +13,7 @@ Options = OptionParser.new do |opts|
 	opts.on("--overwrite", "Overwrite files as you go (won't touch files that faile a syntax check).") { @overwrite = true }
 	opts.banner = "Usage: print ruby into a pretty format, or break trying."
 end
-Options.parse!
+Options.parse!(my_argv)
 
 @indent_token = "\t" unless @indent_token
 @indent_count = 1 unless @indent_count
@@ -28,12 +29,11 @@ def print_or_die(content)
 	end
 end
 
-# no argument, assume we want to open STDIN.
-if ARGV.empty?
+if my_argv.empty?
 	content = $stdin.read
 	print_or_die content
 else
-	ARGV.each do |file|
+	my_argv.each do |file|
 		if File.exist? file
 			fh = open(file)
 			content = fh.read

data/bin/ruby-beautify

@@ -3,6 +3,7 @@ require 'optparse'
 require 'ruby-beautify'
 
 include RubyBeautify
+my_argv = config_argv
 
 Options = OptionParser.new do |opts|
 	opts.on("-V", "--version", "Print version") { |version| puts RBeautify::VERSION;exit 0}
@@ -12,7 +13,7 @@ Options = OptionParser.new do |opts|
 	opts.on("--overwrite", "Overwrite files as you go (won't touch files that faile a syntax check).") { @overwrite = true }
 	opts.banner = "Usage: print ruby into a pretty format, or break trying."
 end
-Options.parse!
+Options.parse!(my_argv)
 
 @indent_token = "\t" unless @indent_token
 @indent_count = 1 unless @indent_count
@@ -28,12 +29,11 @@ def print_or_die(content)
 	end
 end
 
-# no argument, assume we want to open STDIN.
-if ARGV.empty?
+if my_argv.empty?
 	content = $stdin.read
 	print_or_die content
 else
-	ARGV.each do |file|
+	my_argv.each do |file|
 		if File.exist? file
 			fh = open(file)
 			content = fh.read

data/lib/ruby-beautify.rb

@@ -156,4 +156,22 @@ module RubyBeautify
 			output_string += "#{indent}#{string.lstrip}"
 		end
 	end
+
+	# try to find a config and return a modified argv, walks all the way to root
+	# looking for '.ruby-beautify' and then returns an argv with our new options.
+	def config_argv
+		target_dirs = Dir.pwd.split("/")
+
+		# sloppy walk method, not well tested but shouldn't get in the way.
+		while (target_dirs.any?)
+			target = "#{target_dirs.join("/")}/.ruby-beautify"
+			break if File.exist?(target)
+			target_dirs.pop
+			target = nil
+		end
+
+		return ARGV unless target
+		lines = open(target).readlines
+		return ARGV + lines.map {|l| l.chomp}
+	end
 end

data/lib/ruby-beautify/version.rb

@@ -1,3 +1,3 @@
 module RubyBeautify
-	VERSION = "0.97.0"
+	VERSION = "0.97.1"
 end

data/spec/bin/ruby-beautify_spec.rb

@@ -11,6 +11,13 @@ describe "Ruby Beautify" do
 		@overwrite_file = "spec/binary_scenarios/overwrite.rb"
 		@overwrite_target_file = "tmp/copied.rb"
 		@overwrite_pretty_file = "spec/binary_scenarios/overwrite_pretty.rb"
+		# Our space test.
+		@space_before = 'spec/binary_scenarios/spaces_before.rb'
+		@space_after = 'spec/binary_scenarios/spaces_after.rb'
+		@space_after_sum = Digest::MD5.hexdigest File.read @space_after
+		# our count test.
+		@count_before = 'spec/binary_scenarios/count_before.rb'
+		@count_after = 'spec/binary_scenarios/count_after.rb'
 	end
 
 	it "will work" do
@@ -36,6 +43,23 @@ describe "Ruby Beautify" do
 		FileUtils.rm @overwrite_target_file
 	end
 
-	it "will honor --tabs vs --spaces"
-	it "will honor the count prefix"
+	it "will honor --spaces" do
+		beautified_sum = Digest::MD5.hexdigest `bundle exec #{BEAUTIFY_BIN} --spaces #{@space_before}`
+		expect(beautified_sum).to eq(@space_after_sum)
+	end
+
+	it "will honor the ident_count prefix" do
+		beautified_sum = Digest::MD5.hexdigest `bundle exec #{BEAUTIFY_BIN} --indent_count=3 #{@count_before}`
+		count_after_sum = Digest::MD5.hexdigest File.read @count_after
+		expect(beautified_sum).to eq(count_after_sum)
+	end
+
+	it "will use a .ruby-beautify config file" do
+		FileUtils.cp "spec/ruby-beautify.dotfile", "tmp/.ruby-beautify"
+		Dir.chdir "tmp"
+		beautified_sum = Digest::MD5.hexdigest `bundle exec #{BEAUTIFY_BIN} ../#{@space_before}`
+		Dir.chdir ".."
+		FileUtils.rm "tmp/.ruby-beautify"
+		expect(beautified_sum).to eq(@space_after_sum)
+	end
 end

data/spec/binary_scenarios/count_after.rb

@@ -0,0 +1,3 @@
+def count
+			puts "this"
+end

data/spec/binary_scenarios/count_before.rb

@@ -0,0 +1,3 @@
+def count
+	puts "this"
+end

data/spec/binary_scenarios/spaces_after.rb

@@ -0,0 +1,3 @@
+def spaces
+ puts "are an option"
+end

data/spec/binary_scenarios/spaces_before.rb

@@ -0,0 +1,3 @@
+def spaces
+  puts "are an option"
+end

data/spec/ruby-beautify.dotfile

@@ -0,0 +1 @@
+--spaces

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-beautify
 version: !ruby/object:Gem::Version
-  version: 0.97.0
+  version: 0.97.1
 platform: ruby
 authors:
 - Ernie Brodeur
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-18 00:00:00.000000000 Z
+date: 2015-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -76,10 +76,15 @@ files:
 - lib/ruby-beautify/version.rb
 - ruby-beautify.gemspec
 - spec/bin/ruby-beautify_spec.rb
+- spec/binary_scenarios/count_after.rb
+- spec/binary_scenarios/count_before.rb
 - spec/binary_scenarios/doubled_example.rb
 - spec/binary_scenarios/overwrite.rb
 - spec/binary_scenarios/overwrite_pretty.rb
 - spec/binary_scenarios/small_example.rb
+- spec/binary_scenarios/spaces_after.rb
+- spec/binary_scenarios/spaces_before.rb
+- spec/ruby-beautify.dotfile
 - spec/spec_helper.rb
 - spec/usage_scenarios/README.md
 - spec/usage_scenarios/case.rb
@@ -122,10 +127,15 @@ specification_version: 4
 summary: a cli tool (and module) to beautify ruby code.
 test_files:
 - spec/bin/ruby-beautify_spec.rb
+- spec/binary_scenarios/count_after.rb
+- spec/binary_scenarios/count_before.rb
 - spec/binary_scenarios/doubled_example.rb
 - spec/binary_scenarios/overwrite.rb
 - spec/binary_scenarios/overwrite_pretty.rb
 - spec/binary_scenarios/small_example.rb
+- spec/binary_scenarios/spaces_after.rb
+- spec/binary_scenarios/spaces_before.rb
+- spec/ruby-beautify.dotfile
 - spec/spec_helper.rb
 - spec/usage_scenarios/README.md
 - spec/usage_scenarios/case.rb