rocktumbler 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07fc8bc23adbc4dba79640eaeec34420e37fa8d2
-  data.tar.gz: 306289cafbb6a7b5b6b4d66a928ee4357ad1c0b4
+  metadata.gz: a50775ff6bbfeb7f3f2808d4fbb74e88bf9c7813
+  data.tar.gz: b6dd1d646e31368b179bba10ccaa17d1d10d41ce
 SHA512:
-  metadata.gz: f69e39b13c1a784474d7da17a7b2780980d42eeac857cd7921758e8a3f600d5a9abf3b050e10749912b9183d6a948044bee2c06f189c73981010a3fb25177e71
-  data.tar.gz: 90fc86ddea9f437ed7852167ff4f774c555d21a707f38ff827428e9aa5f1f73d95c60ba58306274b4051094505b913d4cae6de8543198ad26728a93e7c071ce3
+  metadata.gz: 2d5e843a203a368989a86a33e6c43158e8d9f29ae6037c267913c476530176f4d80a12044683a6fb7c758514306a0735649af796580565b69b183599e59dbd70
+  data.tar.gz: 5c9483921af905498421fbf4d4e6eb2f0dd20fd8c7a34fdaac6bd5159283677d8e089033067114834f982987aed68bed2eb60976ef681d564e8f891afb6fdf49

data/README.md

@@ -1,6 +1,6 @@
 # Rocktumbler
 
-Rocktumbler is a gem that will take your existing Gemfile and rewrite it to insure that it remains formatted and consistent.
+Rocktumbler is a gem that will take your existing Gemfile and rewrite it to ensure that it remains formatted and consistent.
 
 ## Installation
 

data/lib/rocktumbler/gem.rb

@@ -11,12 +11,25 @@ module Rocktumbler
       str = "#{prepend}# #{gem_info.summary}\n"
       str += "#{prepend}# #{gem_info.homepage}\n"
       str += "#{prepend}gem '#{@gem_dependency.name}'"
-      str += ",'#{@gem_dependency.requirement}'" if @gem_dependency.requirement.specific?
+      str += ",'#{@gem_dependency.requirement}'" unless @gem_dependency.requirement.none?
       str += generate_gem_source(@gem_dependency.source.options) if @gem_dependency.source
-      str += ", require: #{!@gem_dependency.autorequire.empty?}" if @gem_dependency.autorequire
+      str += generate_require(@gem_dependency.autorequire) if @gem_dependency.autorequire
       str += "\n\n"
     end
 
+    private
+
+    def generate_require(autorequire)
+      if autorequire.count > 1
+        # Array.to_s will output double quotes so we gsub them to singles.
+        return ", require: #{autorequire.to_s.gsub(/"/,'\'')}"
+      elsif autorequire.first.is_a?(String)
+        return ", require: '#{autorequire.first}'"
+      else
+        return ", require: #{!autorequire.empty?}"
+      end
+    end
+
     def generate_gem_source(source_options)
       return ", github: '#{source_options['github']}'" if source_options['github']
       return ", path: '#{source_options['path']}'" if source_options['path']

data/lib/rocktumbler/gemfile.rb

@@ -0,0 +1,38 @@
+require_relative 'exceptions'
+
+module Rocktumbler
+  class Gemfile
+    attr_accessor :ruby, :source
+
+    def initialize(gemfile_location)
+      @gemfile_location = gemfile_location
+      @gemfile_contents = read_contents
+      @ruby = parse_ruby
+      @source = parse_source
+    end
+
+    def read_contents
+      gemfile = File.open(@gemfile_location,'r')
+      str = gemfile.read
+      gemfile.close
+      str
+    end
+
+    def print_source_and_ruby
+      str = ""
+      str += "#{@source.gsub(/"/,'\'')}\n\n" if @source
+      str += "#{@ruby.gsub(/"/,'\'')}\n\n" if @ruby
+      str
+    end
+
+    def parse_ruby
+      /^(ruby.*)/.match(@gemfile_contents)
+      $1
+    end
+
+    def parse_source
+      /^(source.*)/.match(@gemfile_contents)
+      $1
+    end
+  end
+end

data/lib/rocktumbler/tumbler.rb

@@ -5,11 +5,13 @@ module Rocktumbler
     def initialize(location=Bundler.default_gemfile)
       @gemfile_location = location
       @bundler_dependencies = parse_gemfile(@gemfile_location)
+      @gemfile = Rocktumbler::Gemfile.new(location)
     end
 
     def tumble(opts={})
       groups = Rocktumbler::GroupFilter.new(@bundler_dependencies).filter
-      clean_gemfile_str = groups.map(&:print).join
+      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]
       return clean_gemfile_str
@@ -20,7 +22,8 @@ module Rocktumbler
       temp_gemfile.write(clean_gemfile_str)
       temp_gemfile.close
       temp_bundler_dependencies = parse_gemfile(temp_gemfile.path)
-      diff = (@bundler_dependencies - temp_bundler_dependencies)
+      diff = @bundler_dependencies - temp_bundler_dependencies
+
       if diff.empty?
         return true
       else
@@ -37,7 +40,8 @@ module Rocktumbler
     private
 
     def parse_gemfile(location)
-      Bundler::Dsl.new.eval_gemfile(location)
+      builder = Bundler::Dsl.new
+      builder.eval_gemfile(location)
     end
   end
 end

data/lib/rocktumbler/version.rb

@@ -1,3 +1,3 @@
 module Rocktumbler
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/rocktumbler.rb

@@ -8,5 +8,6 @@ module Rocktumbler
   autoload :Group,         'rocktumbler/group'
   autoload :GroupFilter,   'rocktumbler/group_filter'
   autoload :Gem,           'rocktumbler/gem'
+  autoload :Gemfile,       'rocktumbler/gemfile'
   autoload :Version,       'rocktumbler/version'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rocktumbler
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Simon Reed
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-26 00:00:00.000000000 Z
+date: 2015-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -58,10 +58,12 @@ files:
 - lib/rocktumbler.rb
 - lib/rocktumbler/exceptions.rb
 - lib/rocktumbler/gem.rb
+- lib/rocktumbler/gemfile.rb
 - lib/rocktumbler/group.rb
 - lib/rocktumbler/group_filter.rb
 - lib/rocktumbler/tumbler.rb
 - lib/rocktumbler/version.rb
+- rocktumbler-0.1.0.gem
 - rocktumbler.gemspec
 homepage: https://github.com/simonreed/rocktumbler
 licenses: