gem_sort 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63039423becb32baf6af0079b3115773ca1f4470
-  data.tar.gz: fccd096f8892c4dc81bb7ac9d95d43e215068a4a
+  metadata.gz: f6e056719ee27a7930aea72edcd0fb31830edec6
+  data.tar.gz: f36458cbfefa5acc31d5f7e611730e87d3a7d915
 SHA512:
-  metadata.gz: 7af44040ab3643dc6211bec7a2ddeeb67e578b8b4ec40b9e79e82d40fe2c65c7b2c9abbe3c75117d4adda5dafa42671a8a22564d85d74a66481f887456bd787c
-  data.tar.gz: 754d0c308019d4920c723d2b27a78a5fcc34397819e1b9940e7f8ea1f6cd9e13f7271125a6644fa22883aaa20396e642b1f07d5a38fa3baf24888ee93e182a5c
+  metadata.gz: c1d63351049cfe749bf14040a985ca79ec11a1e086f011ffe4d207fd40fd147b2f15ec48ab0493c622afa62ee075fd8382ff0faf63e6252490106d60050021f4
+  data.tar.gz: f2e3389731a5c5cbd6003e431b021053aec26faf3cbfc48fef7c9313daaf2dda48ec5bfdfdd04aaa383adf51449dddbb610bd783cbed4431784219d8c2640223

data/lib/gem_sort/sorter.rb

@@ -24,7 +24,7 @@ module GemSort
     end
 
     def sort_block_gems(block)
-      wrap_block(block, unwrap_block(block).sort)
+      wrap_block(block, sort_gems(unwrap_block(block)))
     end
 
     def wrap_block(block, inside)
@@ -47,16 +47,24 @@ module GemSort
       }
     end
 
+    def sort_gems(gems)
+      gems.each { |line| line.gsub!(/\"/,"'") }.sort
+    end
+
     def source_gemfile
       ::Rails.root.join('Gemfile').open('r+')
     end
 
+    def initialized_gemfile
+      ::Rails.root.join('Gemfile').open('w')
+    end
+
     def read_gemfile
       source_gemfile.read.split("\n").select{ |line| line != "" }
     end
 
     def removal_comment_and_blank(text)
-      text.gsub(/#.*$/,'').gsub(/\n(\s|　)*\n/, "\n")
+      text.gsub(/#[^{].*$/,'').gsub(/\n(\s|　)*\n/, "\n\n").gsub(/( |　)+/, ' ')
     end
 
     def magic_comment
@@ -64,9 +72,10 @@ module GemSort
     end
 
     def write_gemfile(text)
-      source_gemfile.write(magic_comment + removal_comment_and_blank(text))
+      initialized_gemfile.write(magic_comment + removal_comment_and_blank(text))
     end
 
+
     def sort!
       gemfile = read_gemfile
 
@@ -89,6 +98,16 @@ module GemSort
         wrap_block(source_block, inside)
       }
 
+      git_source_blocks = extract_line!(gemfile, -> (line) {
+        line.start_with?('git_source') && !line.include?('do')
+      })
+
+      git_source_blocks = extract_blocks!(gemfile, -> (line) {
+        line.start_with?("git_source")
+      }).map{ |group_block|
+        sort_block_gems(group_block)
+      } if git_source_blocks.nil?
+
       source_line = extract_line!(gemfile, -> (line) {
         line.start_with?('source') && !line.end_with?('do')
       })
@@ -102,9 +121,9 @@ module GemSort
       })
 
       sorted_text = inject_between([
-        source_line,
+        [source_line, git_source_blocks],
         [ruby_line, rails_line],
-        gemfile.sort,
+        sort_gems(gemfile),
         inject_between(group_blocks, nil),
         inject_between(source_blocks, nil)
       ], nil).flatten.join("\n")

data/lib/gem_sort/version.rb

@@ -1,3 +1,3 @@
 module GemSort
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gem_sort
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - kozo yamagata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-20 00:00:00.000000000 Z
+date: 2019-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -102,45 +102,45 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: Sorting your gems in Gemfile (for Rails)
 test_files:
+- test/dummy/app/controllers/application_controller.rb
+- test/dummy/app/views/layouts/application.html.erb
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/stylesheets/application.css
-- test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/bin/bundle
-- test/dummy/bin/rails
 - test/dummy/bin/rake
 - test/dummy/bin/setup
-- test/dummy/config/application.rb
-- test/dummy/config/boot.rb
-- test/dummy/config/database.yml
-- test/dummy/config/environment.rb
-- test/dummy/config/environments/development.rb
+- test/dummy/bin/bundle
+- test/dummy/bin/rails
+- test/dummy/config/secrets.yml
+- test/dummy/config/routes.rb
+- test/dummy/config/locales/en.yml
 - test/dummy/config/environments/production.rb
+- test/dummy/config/environments/development.rb
 - test/dummy/config/environments/test.rb
-- test/dummy/config/initializers/assets.rb
+- test/dummy/config/environment.rb
+- test/dummy/config/application.rb
+- test/dummy/config/database.yml
+- test/dummy/config/boot.rb
 - test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/initializers/cookies_serializer.rb
-- test/dummy/config/initializers/filter_parameter_logging.rb
-- test/dummy/config/initializers/inflections.rb
 - test/dummy/config/initializers/mime_types.rb
+- test/dummy/config/initializers/filter_parameter_logging.rb
 - test/dummy/config/initializers/session_store.rb
 - test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/locales/en.yml
-- test/dummy/config/routes.rb
-- test/dummy/config/secrets.yml
+- test/dummy/config/initializers/assets.rb
+- test/dummy/config/initializers/cookies_serializer.rb
+- test/dummy/config/initializers/inflections.rb
 - test/dummy/config.ru
-- test/dummy/public/404.html
+- test/dummy/Rakefile
+- test/dummy/public/favicon.ico
 - test/dummy/public/422.html
 - test/dummy/public/500.html
-- test/dummy/public/favicon.ico
-- test/dummy/Rakefile
+- test/dummy/public/404.html
 - test/dummy/README.rdoc
-- test/gem_sort_test.rb
 - test/integration/navigation_test.rb
+- test/gem_sort_test.rb
 - test/test_helper.rb