gem_sort 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43e2aea74fffa7d6d1ee951ff0c5719b5bf381ad
-  data.tar.gz: 1d0b932a15839d0328d7c6b9c52f2907378b29f3
+  metadata.gz: 63039423becb32baf6af0079b3115773ca1f4470
+  data.tar.gz: fccd096f8892c4dc81bb7ac9d95d43e215068a4a
 SHA512:
-  metadata.gz: 1f87d4b87ce1143496a93ce24aa1b7e6895f28131eed07ed1d5f33962ddc5a5a13ac462ba92212e56f2b8218ff99a6fd540280d92bf01331451e1596900b88f2
-  data.tar.gz: 22e3b116d0ee344817089e9d06ee5022bbf71012b4718f4d4fbc6afcc0a7def43e1753bbd9c61e3fffff096b9a00099b5edf40fb080356aec75f4fd757d90d41
+  metadata.gz: 7af44040ab3643dc6211bec7a2ddeeb67e578b8b4ec40b9e79e82d40fe2c65c7b2c9abbe3c75117d4adda5dafa42671a8a22564d85d74a66481f887456bd787c
+  data.tar.gz: 754d0c308019d4920c723d2b27a78a5fcc34397819e1b9940e7f8ea1f6cd9e13f7271125a6644fa22883aaa20396e642b1f07d5a38fa3baf24888ee93e182a5c

data/lib/gem_sort/sorter.rb

@@ -55,8 +55,16 @@ module GemSort
       source_gemfile.read.split("\n").select{ |line| line != "" }
     end
 
+    def removal_comment_and_blank(text)
+      text.gsub(/#.*$/,'').gsub(/\n(\s|　)*\n/, "\n")
+    end
+
+    def magic_comment
+      "# frozen_string_literal: true\n"
+    end
+
     def write_gemfile(text)
-      source_gemfile.write(text)
+      source_gemfile.write(magic_comment + removal_comment_and_blank(text))
     end
 
     def sort!

data/lib/gem_sort/version.rb

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

data/test/dummy/config/application.rb

@@ -1,26 +1,22 @@
 require File.expand_path('../boot', __FILE__)
 
-require 'rails/all'
+require 'rails'
+# Pick the frameworks you want:
+require 'active_model/railtie'
+# require 'active_record/railtie'
+require 'action_controller/railtie'
+require 'action_mailer/railtie'
+require 'action_view/railtie'
+require 'sprockets/railtie'
+require 'rails/test_unit/railtie'
+
+
 
 Bundler.require(*Rails.groups)
 require "gem_sort"
 
 module Dummy
   class Application < Rails::Application
-    # Settings in config/environments/* take precedence over those specified here.
-    # Application configuration should go into files in config/initializers
-    # -- all .rb files in that directory are automatically loaded.
-
-    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
-    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
-    # config.time_zone = 'Central Time (US & Canada)'
-
-    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
-    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
-    # config.i18n.default_locale = :de
-
-    # Do not swallow errors in after_commit/after_rollback callbacks.
-    config.active_record.raise_in_transactional_callbacks = true
   end
 end
 

data/test/test_helper.rb

@@ -2,8 +2,6 @@
 ENV["RAILS_ENV"] = "test"
 
 require File.expand_path("../../test/dummy/config/environment.rb",  __FILE__)
-ActiveRecord::Migrator.migrations_paths = [File.expand_path("../../test/dummy/db/migrate", __FILE__)]
-ActiveRecord::Migrator.migrations_paths << File.expand_path('../../db/migrate', __FILE__)
 require "rails/test_help"
 
 # Filter out Minitest backtrace while allowing backtrace from other libraries

metadata

@@ -1,37 +1,23 @@
 --- !ruby/object:Gem::Specification
 name: gem_sort
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - kozo yamagata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-02 00:00:00.000000000 Z
+date: 2016-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.2'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -57,11 +43,8 @@ files:
 - lib/gem_sort.rb
 - lib/gem_sort/engine.rb
 - lib/gem_sort/sorter.rb
-- lib/gem_sort/sorter.rb~
 - lib/gem_sort/version.rb
-- lib/gem_sort/version.rb~
 - lib/tasks/gem_sort_tasks.rake
-- lib/tasks/gem_sort_tasks.rake~
 - test/dummy/README.rdoc
 - test/dummy/Rakefile
 - test/dummy/app/assets/javascripts/application.js
@@ -119,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Sorting your gems in Gemfile (for Rails)

data/lib/gem_sort/sorter.rb~

@@ -1,108 +0,0 @@
-module GemSort
-  class Sorter
-    def extract_blocks!(lines, begin_block_condition, nested = false)
-      end_block_condition = -> (line) {
-        (nested ? line.strip : line).start_with?("end")
-      }
-      blocks = []
-
-      while lines.select(&begin_block_condition).length > 0
-        begin_block_index = lines.index(&begin_block_condition)
-        block_length = lines
-          .slice(begin_block_index..lines.length)
-          .index(&end_block_condition)
-        block_length += 1
-        blocks <<  lines.slice!(begin_block_index, block_length)
-      end
-      blocks
-    end
-
-    def extract_line!(lines, condition)
-      target_line = lines.select(&condition).first
-      lines.delete_if{ |line| line == target_line } if target_line != nil
-      target_line
-    end
-
-    def sort_block_gems(block)
-      wrap_block(block, unwrap_block(block).sort)
-    end
-
-    def wrap_block(block, inside)
-      [
-        block.first,
-        *inside,
-        block.last
-      ]
-    end
-
-    def unwrap_block(block)
-      block[1..block.length - 2]
-    end
-
-    def inject_between(array, divider)
-      array.each_with_index.inject([]) { |acc, (item, i)|
-        acc << item
-        acc << divider if array.last != item
-        acc
-      }
-    end
-
-    def source_gemfile
-      ::Rails.root.join('Gemfile').open('r+')
-    end
-
-    def read_gemfile
-      source_gemfile.read.split("\n").select{ |line| line != "" }
-    end
-
-    def write_gemfile(text)
-      source_gemfile.write(text)
-    end
-
-    def sort!
-      gemfile = read_gemfile
-
-      group_blocks = extract_blocks!(gemfile, -> (line) {
-        line.start_with?("group")
-      }).map{ |group_block|
-        sort_block_gems(group_block)
-      }
-
-      source_blocks = extract_blocks!(gemfile, -> (line) {
-        line.start_with?("source ") && line.end_with?("do")
-      }).map{ |source_block|
-        source_inside = unwrap_block(source_block)
-        inside_group_blocks = extract_blocks!(source_inside, -> (line) {
-          line.strip.start_with?("group")
-        }, true).map{ |inside_group_block|
-          sort_block_gems(inside_group_block)
-        }
-        inside = source_inside.sort + inject_between(inside_group_blocks, nil)
-        wrap_block(source_block, inside)
-      }
-
-      source_line = extract_line!(gemfile, -> (line) {
-        line.start_with?('source') && !line.end_with?('do')
-      })
-
-      ruby_line = extract_line!(gemfile, -> (line) {
-        line.start_with?('ruby')
-      })
-
-      rails_line = extract_line!(gemfile, -> (line) {
-        line.start_with?('gem "rails"') || line.start_with?("gem 'rails'")
-      })
-
-      sorted_text = inject_between([
-        source_line,
-        [ruby_line, rails_line],
-        gemfile.sort,
-        inject_between(group_blocks, nil),
-        inject_between(source_blocks, nil)
-      ], nil).flatten.join("\n")
-
-      write_gemfile(sorted_text)
-=end
-    end
-  end
-end

data/lib/gem_sort/version.rb~

@@ -1,3 +0,0 @@
-module GemSort
-  VERSION = "0.0.1"
-end

data/lib/tasks/gem_sort_tasks.rake~

@@ -1,7 +0,0 @@
-require 'gem_sort/sorter'
-
-namespace :gem do
-  task :sort do
-    puts Rails.root.join('Gemfile')
-  end
-end