rocktumbler 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3672a2966e07f824bf93a4fa47783b2a7e6f9db8
-  data.tar.gz: e465ca4f509cc7e1c3cd7440864869e11c6c6243
+  metadata.gz: cfffcc07e1c5c9f09a99f2f68545b44909d6cfa6
+  data.tar.gz: e419bfb6576fdc80c32b1cca3bd8bf349d693911
 SHA512:
-  metadata.gz: 14d46c2c1a4a47cea7313a327a4dcbfe1823560922b6d87871cba6d7fe534a794038e9775752e941c3886f3e70aa2c27f446d9c1434a3d340e0ab11d677182eb
-  data.tar.gz: 9d8850f4559bff799ec5e35afe9e3167fdb041d418bb0d283c539361e3663e8249677e44c9d7c7120e450b3df91a5c65040beb23b1ab44749a2223c03c478bac
+  metadata.gz: 5d6011de66d607bf616da77f0f60dac3742ec7dedc95b9ef38d8013e55c785316d4eab64fd5481b94169e3c16b91dc2eba1cd414a0ff54407b3181d44b20fa0b
+  data.tar.gz: 48cd577fa16a238d5958011ac271e024fb86b617b839b2f7a47da4323758e4400b04b95e2c1fb82ebec6ae8f9bd97d951c9594f8df986e16d17f70e6e0ce7412

data/README.md

@@ -1,6 +1,6 @@
 # Rocktumbler
 
-[![Build Status](https://travis-ci.org/simonreed/rocktumbler.svg)](https://travis-ci.org/simonreed/rocktumbler)
+[![Build Status](https://travis-ci.org/simonreed/rocktumbler.svg)](https://travis-ci.org/simonreed/rocktumbler) [![Code Climate](https://codeclimate.com/github/simonreed/rocktumbler/badges/gpa.svg)](https://codeclimate.com/github/simonreed/rocktumbler)
 
 Rocktumbler is a gem that will take your existing Gemfile and ensure that it remains formatted and consistent.
 
@@ -64,6 +64,7 @@ Specific options:
     -i, --info                       Display gem info comment.
     -d, --homepage                   Display gem homepage comment.
     -s, --skip-write                 Skip writing of Gemfile
+    -l, --verbose                    Display formatted output to STDOUT
 
 Common options:
     -h, --help                       Show this message

data/bin/tumble

@@ -4,4 +4,12 @@
 Signal.trap('INT') { exit 1 }
 
 require 'rocktumbler'
-Rocktumbler::Tumbler.new.tumble
+require 'benchmark'
+
+cli = Rocktumbler::CLI.new
+
+time = Benchmark.realtime do
+  cli.run
+end
+
+puts "Rocktumbler finished in #{time} seconds" if cli.opts.verbose

data/lib/rocktumbler/cli.rb

@@ -0,0 +1,18 @@
+require_relative 'exceptions'
+
+module Rocktumbler
+  # The CLI is a class responsible of handling all the command line interface
+  # logic.
+  class CLI
+    attr_reader :opts
+
+    def initialize()
+      @opts = {}
+    end
+
+    def run(args = ARGV)
+      @opts = Option.parse(args)
+      Rocktumbler::Tumbler.new(@opts).tumble
+    end
+  end
+end

data/lib/rocktumbler/gem.rb

@@ -27,7 +27,6 @@ module Rocktumbler
       str += format_requirement || ''
       str += format_source
       str += format_require(@gem_dep.autorequire)
-      str
     end
 
     def format_requirement

data/lib/rocktumbler/group.rb

@@ -6,7 +6,7 @@ module Rocktumbler
     def initialize(name, gem_dependencies, opts)
       @name = name
       @opts = opts
-      @gems = gem_dependencies.map { |g| Rocktumbler::Gem.new(g, @opts) }
+      @gems = gems_from_dependencies(gem_dependencies)
     end
 
     def print
@@ -19,5 +19,9 @@ module Rocktumbler
       str += "\nend\n" if @name != :default
       str
     end
+
+    def gems_from_dependencies(gem_dependencies)
+      gem_dependencies.map { |g| Rocktumbler::Gem.new(g, @opts) }
+    end
   end
 end

data/lib/rocktumbler/group_filter.rb

@@ -9,7 +9,6 @@ module Rocktumbler
 
     def filter
       gems_by_group = @gem_dependencies.group_by(&:groups)
-
       default_gems = gems_by_group.delete([:default])
       default_gems.sort!
       groups = [Rocktumbler::Group.new(:default, default_gems, @opts)]

data/lib/rocktumbler/option.rb

@@ -13,6 +13,7 @@ module Rocktumbler
       options.gem_info = false
       options.gem_homepage = false
       options.skip_write = false
+      options.verbose = false
 
       opt_parser = OptionParser.new do |opts|
         opts.banner = "Usage: tumble [options]"
@@ -32,6 +33,10 @@ module Rocktumbler
           options.skip_write = true
         end
 
+        opts.on("-l", "--verbose", "Display formatted output to STDOUT") do |docs|
+          options.verbose = true
+        end
+
         opts.separator ""
         opts.separator "Common options:"
 

data/lib/rocktumbler/tumbler.rb

@@ -4,21 +4,44 @@ module Rocktumbler
   # The Tumbler class is responsible for executing the top level tumble method
   # and reads, parses, cleans, writes and verifies the new gemfile.
   class Tumbler
-    def initialize(location = Bundler.default_gemfile)
-      @opts = {}
+
+    def initialize(opts, location = Bundler.default_gemfile)
+      @opts = opts
       @gemfile_location = location
       @bundler_dependencies = parse_gemfile(@gemfile_location)
+      @original_gemfile_str = File.open(@gemfile_location).read
       @gemfile = Rocktumbler::Gemfile.new(location)
     end
 
-    def tumble(args = ARGV)
-      @opts = Option.parse(args)
+    def tumble
       groups = Rocktumbler::GroupFilter.new(@bundler_dependencies, @opts).filter
       clean_gemfile_str = @gemfile.print_source_and_ruby
       clean_gemfile_str << groups.map(&:print).join
-      compare_to_original_gemfile(clean_gemfile_str)
-      write(clean_gemfile_str) unless @opts.skip_write
-      clean_gemfile_str
+      if clean_gemfile_str == @original_gemfile_str
+        print Rainbow("No changes required to Gemfile\n").yellow
+      else
+        compare_to_original_gemfile(clean_gemfile_str)
+        write(clean_gemfile_str) unless @opts.skip_write
+        print Rainbow("New Gemfile generated and written to \
+#{@gemfile_location}\n").green
+        verbose_highlight(clean_gemfile_str) if @opts.verbose
+      end
+    end
+
+    private
+
+    def verbose_highlight(source)
+      print "\n"
+      formatter = Rouge::Formatters::Terminal256.new(theme: 'github')
+      lexer = Rouge::Lexers::Ruby.new
+      print formatter.format(lexer.lex(source))
+      print "\n"
+    end
+
+    def write(clean_gemfile_str)
+      gemfile = File.open(@gemfile_location, 'w')
+      gemfile.write(clean_gemfile_str)
+      gemfile.close
     end
 
     def compare_to_original_gemfile(clean_gemfile_str)
@@ -34,14 +57,6 @@ module Rocktumbler
       end
     end
 
-    def write(clean_gemfile_str)
-      gemfile = File.open(@gemfile_location, 'w')
-      gemfile.write(clean_gemfile_str)
-      gemfile.close
-    end
-
-    private
-
     def write_temp_gemfile(clean_gemfile_str)
       temp_gemfile = Tempfile.new('Gemfile.temp')
       temp_gemfile.write(clean_gemfile_str)

data/lib/rocktumbler/version.rb

@@ -1,4 +1,4 @@
 # Rocktumbler module
 module Rocktumbler
-  VERSION = '0.1.3'
+  VERSION = '0.2.0'
 end

data/lib/rocktumbler.rb

@@ -2,9 +2,12 @@ require 'open-uri'
 require 'ostruct'
 require 'tempfile'
 require 'bundler'
+require 'rainbow'
+require 'rouge'
 
 # Rocktumbler module
 module Rocktumbler
+  autoload :CLI,           'rocktumbler/cli'
   autoload :Tumbler,       'rocktumbler/tumbler'
   autoload :Group,         'rocktumbler/group'
   autoload :GroupFilter,   'rocktumbler/group_filter'

data/rocktumbler.gemspec

@@ -10,7 +10,8 @@ Gem::Specification.new do |spec|
   spec.email         = ['simonpreed@gmail.com']
 
   spec.summary       = 'Polish your Gemfile to make sure it remains consistent.'
-  spec.description   = 'Polish your Gemfile to make sure it remains consistent.'
+  spec.description   = 'Rocktumbler is a gem that will take your existing \
+Gemfile and ensures that it remains formatted and consistent.'
   spec.homepage      = 'https://github.com/simonreed/rocktumbler'
   spec.license       = 'MIT'
 
@@ -21,7 +22,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency('rspec', '~> 3.2.0')
+  spec.add_development_dependency('rspec', '~> 3.2.0', '>= 3.2.0')
 
   spec.add_runtime_dependency 'bundler', '~> 1.7'
+  spec.add_runtime_dependency 'rainbow', '2.0.0'
+  spec.add_runtime_dependency 'rouge', '1.9.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rocktumbler
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Simon Reed
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-05 00:00:00.000000000 Z
+date: 2015-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -31,6 +31,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -38,6 +41,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -52,7 +58,37 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
-description: Polish your Gemfile to make sure it remains consistent.
+- !ruby/object:Gem::Dependency
+  name: rainbow
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: rouge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.9.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.9.0
+description: |-
+  Rocktumbler is a gem that will take your existing \
+  Gemfile and ensures that it remains formatted and consistent.
 email:
 - simonpreed@gmail.com
 executables:
@@ -70,6 +106,7 @@ files:
 - Rakefile
 - bin/tumble
 - lib/rocktumbler.rb
+- lib/rocktumbler/cli.rb
 - lib/rocktumbler/exceptions.rb
 - lib/rocktumbler/gem.rb
 - lib/rocktumbler/gemfile.rb