ruby-beautify 0.9.0 → 0.91.0

data/.gitignore

@@ -1,2 +1 @@
-*.orig
-*.pyc
+Gemfile.lock

data/Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in ruby-beautify.gemspec
+gemspec

data/LICENSE

@@ -0,0 +1,22 @@
+Copyright (c) 2012 Ernie Brodeur
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,5 +1,50 @@
-About
-=====
-This is a CLI bin to help print pretty ruby text to console.
+# RBeautify
 
-This is a modifitcation of the sublime-text2 plugin provided by https://github.com/CraigWilliams/BeautifyRuby/blob/master/lib/rbeautify.rb
+This gem provides a cli binary named 'rbeautify' that will pretty up ruby code.
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+    gem 'ruby-beautify'
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install ruby-beautify
+
+## Usage
+
+To Pretty up a file:
+
+		$ rbeautify filename
+
+It can take mulitple filenames:
+
+		$ rbeautify a b c
+
+Without a filename it reads from STDIN, suitable for piping:
+
+		$ curl 'http://example.org/ugly-file.rb' | rbeautify
+
+It has help:
+
+		$ rbeautify -h
+
+
+## Contributing
+
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Added some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request
+
+# History
+
+The original analyzer is available at: http://www.arachnoid.com/ruby/rubyBeautifier.html.
+
+My work is based off of this sublime-text2 plugin: https://github.com/CraigWilliams/BeautifyRuby but cleaned up and made suitable for use directly in a shell.

data/Rakefile

@@ -0,0 +1,2 @@
+#!/usr/bin/env rake
+require "bundler/gem_tasks"

data/bin/rbeautify

@@ -1,12 +1,8 @@
 #!/usr/bin/ruby
-require 'rbeautify'
-require 'app'
-require 'cli'
-require 'filemagic'
+require 'ruby-beautify'
 
-include ErnieBrodeur
+include RBeautify
 
-App.version = "0.9.0"
 App.banner = "Usage: print ruby into a pretty format, or break trying."
 
 Options.parse!

data/lib/{rbeautify.rb → ruby-beautify.rb}

@@ -1,13 +1,18 @@
-require 'rbeautify/block_start'
-require 'rbeautify/block_end'
-require 'rbeautify/block_matcher'
-require 'rbeautify/language'
-require 'rbeautify/line'
+require 'yajl'
+require 'sys/proctable'
 
-require 'rbeautify/config/ruby'
+require 'ruby-beautify/app'
+require 'ruby-beautify/cli'
+require 'ruby-beautify/filemagic'
+require "ruby-beautify/version"
+require 'ruby-beautify/block_start'
+require 'ruby-beautify/block_end'
+require 'ruby-beautify/block_matcher'
+require 'ruby-beautify/language'
+require 'ruby-beautify/line'
+require 'ruby-beautify/config/ruby'
 
 module RBeautify
-
   def self.beautify_string(language, source, use_tabs=false)
     dest = ""
     block = nil

data/lib/ruby-beautify/app.rb

@@ -0,0 +1,14 @@
+module RBeautify
+  class Application
+    attr_accessor :banner
+    attr_accessor :long_description
+
+    # return the name of the app, for now this is just the cmd ran, later it will be
+    # something generated but more unique.
+    def name
+      $0.split("/").last
+    end
+  end
+
+  App = RBeautify::Application.new
+end

data/lib/ruby-beautify/cli.rb

@@ -0,0 +1,56 @@
+require 'optparse'
+
+module RBeautify
+  class OptBlob
+    def initialize
+      @options = {}
+
+      @parser = OptionParser.new do |opts|
+        opts.banner = App.banner
+
+        opts.on("-V", "--version", "Print version") { |version| @options[:version] = true}
+      end
+    end
+
+    #TODO figure out a more dynamic way to include the parser and hash table.
+    def []=(key, value)
+      @options[key] = value
+    end
+
+    def [](key)
+      @options[key]
+    end
+
+    # This will build an on/off option with a default value set to false.
+    def bool_on(word, description = "")
+      Options[word.to_sym] = false
+      @parser.on "-#{word.chars.first}", "--[no]#{word}", description  do |o|
+        Options[word.to_sym] == o
+      end
+    end
+
+    # This is the parser value on lifted up.
+    def on(*opts, &block)
+      @parser.on(*opts, &block)
+    end
+
+    def parse!
+      @parser.banner = App.banner
+      @parser.parse!
+
+      if @options[:version]
+        puts App.version
+        exit 0
+      end
+    end
+
+    def on_pry
+      if @options[:pry]
+        require 'pry'
+        binding.pry
+      end
+    end
+  end
+
+  Options = OptBlob.new
+end

data/lib/{filemagic.rb → ruby-beautify/filemagic.rb}

@@ -1,4 +1,4 @@
-module ErnieBrodeur
+module RBeautify
   # Add some basic filemagic types.
   class FileMagic
     def self.mime_type(file)
@@ -9,5 +9,4 @@ module ErnieBrodeur
       end
     end
   end
-  App.plugins.push 'filemagic'
 end

data/lib/ruby-beautify/version.rb

@@ -0,0 +1,3 @@
+module RBeautify
+  VERSION = "0.91.0"
+end

data/{rbeautify.gemspec → ruby-beautify.gemspec}

@@ -1,6 +1,7 @@
+require File.expand_path('../lib/ruby-beautify/version', __FILE__)
+
 Gem::Specification.new do |gem|
   gem.name        = 'ruby-beautify'
-  gem.version     = '0.9.0'
   gem.summary     = "a cli tool (and module) to beautify ruby code."
   gem.description = gem.summary
   gem.authors     = ["Ernie Brodeur", "Craig Williams", "Joel Chippindale", "Paul Lutus"]
@@ -8,8 +9,11 @@ Gem::Specification.new do |gem|
   gem.homepage    = "https://github.com/erniebrodeur/ruby-beautify"
 
   gem.add_development_dependency "rspec"
+  gem.add_runtime_dependency "yajl-ruby"
+  gem.add_runtime_dependency "sys-proctable"
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   gem.require_paths = ["lib"]
+  gem.version       = RBeautify::VERSION
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-beautify
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.91.0
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-08 00:00:00.000000000 Z
+date: 2012-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -30,6 +30,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sys-proctable
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: a cli tool (and module) to beautify ruby code.
 email: ebrodeur@ujami.net
 executables:
@@ -38,21 +70,24 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- Gemfile
+- LICENSE
 - README.md
+- Rakefile
 - bin/rbeautify
-- lib/app.rb
 - lib/beautifier.rb
-- lib/cli.rb
-- lib/filemagic.rb
-- lib/rbeautify.rb
-- lib/rbeautify/block_end.rb
-- lib/rbeautify/block_matcher.rb
-- lib/rbeautify/block_start.rb
-- lib/rbeautify/config/ruby.rb
-- lib/rbeautify/language.rb
-- lib/rbeautify/line.rb
-- license.txt
-- rbeautify.gemspec
+- lib/ruby-beautify.rb
+- lib/ruby-beautify/app.rb
+- lib/ruby-beautify/block_end.rb
+- lib/ruby-beautify/block_matcher.rb
+- lib/ruby-beautify/block_start.rb
+- lib/ruby-beautify/cli.rb
+- lib/ruby-beautify/config/ruby.rb
+- lib/ruby-beautify/filemagic.rb
+- lib/ruby-beautify/language.rb
+- lib/ruby-beautify/line.rb
+- lib/ruby-beautify/version.rb
+- ruby-beautify.gemspec
 - spec/fixtures/ruby.yml
 - spec/rbeautify/block_matcher_spec.rb
 - spec/rbeautify/block_start_spec.rb

data/lib/app.rb

@@ -1,79 +0,0 @@
-$:.push '/home/ebrodeur/Projects/bin_snippets/lib'
-
-# Some requires, they don't fit elsewhere.
-require 'yajl'
-require 'sys/proctable'
-module ErnieBrodeur
-
-  class Application
-    attr_accessor :version
-    attr_accessor :banner
-    attr_accessor :long_description
-    attr_accessor :plugins
-
-    # return the name of the app, for now this is just the cmd ran, later it will be
-    # something generated but more unique.
-    def name
-      $0.split("/").last
-    end
-
-    def cache_dir
-      "#{Dir.home}/.cache/erniebrodeur/#{App.name}/"
-    end
-
-    def config_dir
-      "#{Dir.home}/.config/erniebrodeur/#{App.name}/"
-    end
-
-    def pids
-      a = Sys::ProcTable.ps.select{|x| x.cmdline =~ /.*#{App.name}.*-[dD].*/}.map {|x| x.pid}
-      a.delete $$
-      return a if a.any?
-      nil
-    end
-
-    def initialize
-      @version = '0.0.0'
-      @banner  = 'A bin snippet by Ernie Brodeur that does . . . something.'
-      @long_description = ''
-      @plugins = []
-    end
-
-    def daemonize(*params, &block)
-      if params[0] && !params[0][:multiple_pids] && pids
-        puts_or_log :info, "#{App.name} appears to be running (#{pids}), only one allowed, exiting."
-        exit
-      end
-      puts_or_log :info, "Forking to background."
-
-      Process.daemon
-      block.call
-    end
-
-    def kill_daemon
-      if !pids
-        puts_or_log :fatal, "No pids found, exiting."
-      end
-
-      pids.each do |p|
-        puts_or_log :info, "Killing #{p}"
-        %x[kill -TERM #{p}]
-           end
-           end
-           private
-           def puts_or_log(l, s)
-             if App.plugins.include? 'logging'
-               Log.send l, s
-             else
-               puts s
-               exit if l.to_sym == :fatal
-             end
-           end
-           end
-
-           App = Application.new
-
-           # This will load a helper, if it exists.
-           f = "#{$:.last}/helpers/#{App.name}.rb"
-           require f if File.exist? f
-           end

data/lib/cli.rb

@@ -1,81 +0,0 @@
-# This library is to reduce the amount of effort I need to build a binary with option parsing
-# and sensable defaults.  It is not intended to be convient for anybody but me, their
-# are a host of good @options out there if you want cli tools.
-require 'optparse'
-
-module ErnieBrodeur
-  class OptBlob
-    def initialize
-      @options = {}
-
-      @parser = OptionParser.new do |opts|
-        opts.banner = ErnieBrodeur::App.banner
-
-        opts.on("-V", "--version", "Print version") { |version| @options[:version] = true}
-        opts.on("-p", "--pry", "open a pry shell.") { |pry| @options[:pry] = true}
-        if App.plugins.include? 'logging'
-          opts.on("-l", "--log-level LEVEL", "Change the log level, default is debug.") { |level| ErnieBrodeur::Log.level level }
-          opts.on("--log-file FILE", "What file to output to, default is STDOUT") { |file| ErnieBrodeur::Log.filename file }
-        end
-      end
-    end
-
-    #TODO figure out a more dynamic way to include the parser and hash table.
-    def []=(key, value)
-      @options[key] = value
-    end
-
-    def [](key)
-      @options[key]
-    end
-
-    # This will build an on/off option with a default value set to false.
-    def bool_on(word, description = "")
-      Options[word.to_sym] = false
-      @parser.on "-#{word.chars.first}", "--[no]#{word}", description  do |o|
-        Options[word.to_sym] == o
-      end
-    end
-
-    # This is the parser value on lifted up.
-    def on(*opts, &block)
-      @parser.on(*opts, &block)
-    end
-
-    def on_tail(*opts, &block)
-      @parser.on(*opts, &block)
-    end
-
-    def on_head(*opts, &block)
-      @parser.on(*opts, &block)
-    end
-
-    def parse!
-      @parser.banner = ErnieBrodeur::App.banner
-      @parser.parse!
-
-      if @options[:version]
-        puts ErnieBrodeur::App.version
-        exit 0
-      end
-
-      # we need to mash in our config array.  To do this we want to make config
-      # options that don't overwrite cli options.
-      if App.plugins.include? 'config'
-        Config.each do |k,v|
-          @options[k] = v if !@options[k]
-        end
-      end
-    end
-
-    def on_pry
-      if @options[:pry]
-        require 'pry'
-        binding.pry
-      end
-    end
-  end
-
-  App.plugins.push "cli"
-  Options = OptBlob.new
-end

data/license.txt

@@ -1,77 +0,0 @@
- All software in this package is covered by the MIT license and beerware (rev42).
-
-   Copyright (c) 2011 Ernie Brodeur
-
-   Permission is hereby granted, free of charge, to any person
-   obtaining a copy of this software and associated documentation
-   files (the "Software"), to deal in the Software without
-   restriction, including without limitation the rights to use,
-   copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the
-   Software is furnished to do so, subject to the following
-   conditions:
-
-   The above copyright notice and this permission notice shall be
-   included in all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-   OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-   HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-   FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-   OTHER DEALINGS IN THE SOFTWARE.
-
-/*
- * ----------------------------------------------------------------------------
- * "THE BEER-WARE LICENSE" (Revision 42):
- * Ernie Brodeur wrote this package. As long as you retain this notice you
- * can do whatever you want with his stuff. If we meet some day, and you think
- * this stuff is worth it, you can buy me a beer in return.
- * ----------------------------------------------------------------------------
- */
-
-Further supported by: https://github.com/CraigWilliams/BeautifyRuby/blob/master/lib/rbeautify.rb
-
-All of BeautifyRuby is licensed under the MIT license.
-
-Copyright (c) 2011 Craig Williams <cwilliams.allancraig@gmail.com>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-Pieces provided originally by: http://www.arachnoid.com/ruby/rubyBeautifier.html
-
-/***************************************************************************
- *   Copyright (C) 2008, Joel Chippindale, Paul Lutus                      *
- *                                                                         *
- *   This program is free software: you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation, either version 3 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
- *                                                                         *
- ***************************************************************************/