eefgilm 0.0.5 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2447a7e9a09a8dc48abb413b05dcb1ea345679f
-  data.tar.gz: d903402a832491fe0e4ccfbb0f687ac386d1d92a
+  metadata.gz: 213bba7090ed949e3691e4d491d2b5c7000f9e09
+  data.tar.gz: c0a82a26ba9f22e5b3d6f81486e2f3aef194534c
 SHA512:
-  metadata.gz: f6613e016d425e82070563cf952bb2b4678d6c7e68f15caf9a2ffd535ef7243cf646c664d6805f7ae6981f76ed96e03370f92bc494e5f06b14f324372641fc14
-  data.tar.gz: aef3129bfd0520e8de8fc9cf30cca8146700cac813089a71732c0c1e0c3050b1ac11b3456adb78cea12c67b31332f30f1c2cfb943282542482aa98631667c206
+  metadata.gz: b9938207fb7f954a211ca40172efb29f4df497ccd4231880d487f810c0b67de8890f8afe03e40328c8fdaab0710be240b57cd70e32fceebad84240c56bfc5acb
+  data.tar.gz: 13c950cf7e793782f2b9ddfc4cc80af71a93a02269c8ba2d6551962fdfca8060699b0007c99e7393434189df282935b9b47ea29b85a4aff8a4195a788bbf988f

data/README.md

@@ -1,32 +1,91 @@
+[![Build Status](https://travis-ci.org/enilsen16/Eefgilm.svg?branch=master)](https://travis-ci.org/enilsen16/Eefgilm)
+[![Gem Version](https://badge.fury.io/rb/eefgilm.svg)](http://badge.fury.io/rb/eefgilm)
 [![Stories in Ready](https://badge.waffle.io/enilsen16/eefgilm.png?label=ready&title=Ready)](https://waffle.io/enilsen16/eefgilm)
 #Eefgilm: A gem for cleaning up your Gemfile
 
 #Description:
-This gem automatically sorts the Gemfile alphabetically and removes comments, per Best Practice. Grouped gems are only sorted within their group.
+**Important, currently does not support group blocks. If you have groups they will not included in the revised gemfile!**
 
+This gem automatically modifies a ruby gemfile to make them a little easier to read, it does this by alphabetizing the gems, removing all comments, and removing all whitespace including leading and trailing.
 
-## Installation
+---
 
-Add this line to your application's Gemfile:
+## Installation
+The simplest way to install Eefgilm is to
+Run this command:
 
-    gem 'eefgilm'
+     gem install eefgilm
 
-And then execute:
+Alternatively you can include it in a gem file with:
 
-    $ bundle
+     gem 'eefgilm'
 
-Or install it yourself as:
+and then run
 
-    $ gem install eefgilm
+     bundle install
 
+---
 ## Usage
 
-TODO: Write usage instructions here
+Once you have installed eefgilm on your system or in a project directory its quite simple to use. In the directory who's gemfile you would like to modify run:
+
+    eefglim
+
+Currently it will not ask you for any confirmation before making modifications, nor will it create a backup so please be careful when using eefgilm. It may be a good idea to backup your gemfile beforehand hand this can be done with:
+
+     cp Gemfile Gemfilebackup
 
+---
 ## Contributing
+We welcome contributions! If you want to help out you have many options:
 
 1. Fork it ( https://github.com/enilsen16/eefgilm/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create a new Pull Request
+
+---
+##Issues
+If you find a bug or have a suggestion, please create a new issue and we will look into it. Thank You. 
+[Create a new issue](https://github.com/enilsen16/Eefgilm/issues/new)
+
+---
+##Contact
+
+
+---
+
+##Thanks
+The following people have helped with development or project design in one form or another:  
+[Steve Buckley](https://github.com/buckleys78)  
+[Brook Riggio](https://github.com/brookr)  
+[Cheri](https://github.com/cherimarie)  
+[David](https://github.com/dbalatero)  
+
+---
+##License
+
+And now for the fun part...
+
+The MIT License (MIT)
+
+Copyright (c) <2014> <Marco Lindsay & Erik Nilsen>
+
+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/lib/eefgilm/gemfile.rb

@@ -1,10 +1,10 @@
 module Eefgilm
   class Gemfile
-    attr_accessor :path, :lines, :source, :group
+    attr_accessor :path, :source, :groups
 
     def initialize(path = ".", options = {})
       @path  = path
-      @lines = []
+      @groups ={}
       @options = {
         :alphabetize => true,
         :delete_whitespace => true,
@@ -30,24 +30,41 @@ module Eefgilm
 
     def extract_to_array_of_lines
       gemfile = File.open("#{@path}/Gemfile", "r+")
-
+      group_block = :all
       file_lines = gemfile.readlines
+
       file_lines.each do |line|
         self.source = line if line.match(/^source/)
-        group       = line.match(//) if line.match(/^\s*group/)
-        self.lines << line if line.match(/^\s*gem/)
+
+        if line.match(/^\s*group/)
+          group_block = line.match(/^group (:.*)[,|\s]/)[1]
+        elsif line.match(/^\s*end/)
+          group_block = :all
+        end
+
+        if line.match(/^\s*gem/)
+          if self.groups[group_block].nil?
+            self.groups[group_block] = [line]
+          else
+            self.groups[group_block] << line
+          end
+        end
       end
     end
 
     def change_double_qoutes_to_single
-      @lines.each do |line|
-        line.gsub!('"',"'")
+      @groups.each do |group, gems|
+        @groups[group] = gems.map do |g|
+          g.gsub('"',"'")
+        end
       end
     end
 
     def delete_comments!
-      @lines.each do |string|
-        string.gsub!(/#(.*)$/, "")
+      @groups.each do |group, gems|
+        @groups[group] = gems.map do |g|
+          g.gsub(/#(.*)$/, "")
+        end
       end
     end
 
@@ -56,9 +73,19 @@ module Eefgilm
       output.puts @source
       output.puts
 
-      @lines.each do |line|
-        unless line.empty?
-          output.puts line
+      @groups.each do |group, gems|
+        if group == :all
+          gems.each do |g|
+            output.puts g
+          end
+        else
+          output.puts
+          output.puts "group #{group}"
+
+          gems.each do |g|
+            output.puts "  #{g}"
+          end
+          output.puts "end"
         end
       end
 
@@ -66,12 +93,16 @@ module Eefgilm
     end
 
     def alphabetize_gems!
-      @lines.sort!
+      @groups.each do |group, gems|
+        @groups[group] = gems.sort
+      end
     end
 
     def delete_whitespace!
-      @lines.each do |line|
-        line.gsub!(/(?<=^|\[)\s+|\s+(?=$|\])|(?<=\s)\s+/, "")
+      @groups.each do |group, gems|
+        @groups[group] = gems.map do |g|
+          g.gsub(/(?<=^|\[)\s+|\s+(?=$|\])|(?<=\s)\s+/, "")
+        end
       end
     end
   end

data/lib/eefgilm/version.rb

@@ -1,3 +1,3 @@
 module Eefgilm
-  VERSION = "0.0.5"
+  VERSION = "1.0.0"
 end

data/test/data/sources/original/groupgems

@@ -0,0 +1,32 @@
+source 'https://rubygems.org'
+
+gem 'devise'
+gem 'foundation-rails'
+gem 'rails', '4.1.1'
+gem 'sass-rails', '~> 4.0.3'
+gem 'uglifier', '>= 1.3.0'
+gem 'coffee-rails', '~> 4.0.0'
+
+group :development do
+  gem "sqlite3"
+end
+
+gem "minitest-rails"
+gem 'jquery-rails'
+gem 'turbolinks'
+gem 'jbuilder', '~> 2.0'
+gem 'sdoc', '~> 0.4.0',          group: :doc
+gem 'spring',        group: :development
+
+group :test do
+  gem "minitest-rails-capybara"
+  gem "launchy"
+end
+group :development do
+  gem 'rails_layout'
+end
+
+group :production do
+  gem 'pg'
+  gem 'rails_12factor'
+end

data/test/data/sources/original/railsgem

@@ -39,4 +39,19 @@ gem 'spring'
 # gem 'debugger'
 
 
+group :test do
+  gem "minitest-rails-capybara"
+  gem "launchy"
+end
+group :development, :test do
+  gem 'rails_layout'
+end
+
+group :production do
+  gem 'pg'
+  gem 'rails_12factor'
+end
+
+
+
 

data/test/features/gemfile_test.rb

@@ -15,12 +15,6 @@ describe "Gemfile" do
 
     it "must remove a files comments" do
       @worker.clean!.wont_match /.../
-      #File.read(@file) {|f| f.read }.wont_match /#(.*)$/
-    end
-
-    it "should Alphabetize each gem in your gemfile" do
-      @worker.clean!
-      @worker.lines.must_equal @worker.lines.sort
     end
 
     it "should remove unnecessary whitespace" do
@@ -30,7 +24,17 @@ describe "Gemfile" do
       File.read(@file).each_line do |line|
         count += 1 if regex.match(line)
       end
-      count.must_equal 1
+      count.must_equal 9
     end
+
+    it "should alphabetize groups" do
+      @worker.clean!
+      @worker.groups[:all].must_equal @worker.groups[:all].sort
+    end
+
+    # it "should alphabetize gems within a group" do
+
+    # end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eefgilm
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 1.0.0
 platform: ruby
 authors:
 - Erik Nilsen
@@ -75,6 +75,7 @@ files:
 - lib/eefgilm/version.rb
 - test/data/sources/dummy/Gemfile
 - test/data/sources/expected/Gemfile
+- test/data/sources/original/groupgems
 - test/data/sources/original/railsgem
 - test/features/gemfile_test.rb
 - test/test_helper.rb
@@ -105,6 +106,7 @@ summary: A gem to keep your Gemfile in best practice .
 test_files:
 - test/data/sources/dummy/Gemfile
 - test/data/sources/expected/Gemfile
+- test/data/sources/original/groupgems
 - test/data/sources/original/railsgem
 - test/features/gemfile_test.rb
 - test/test_helper.rb