ordinare 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8eefbe9b6d3f26de2734863db44c6545edbad95
-  data.tar.gz: 3caea8639b118c3b4165a0d59921c9735cc72279
+  metadata.gz: 14a96df1b928e752b8e7e4f58dec45684cf7eeca
+  data.tar.gz: 82c1d5904834601be09a5b01559268f08e2a7791
 SHA512:
-  metadata.gz: 3c8dc9e5021c9ed77f65a9da1822f34ba02bffe5e87de87a939f164ec423ba6b8d478e7c847f42c181a94de59f2a588e7d749aa817768848e3cbfd34f6187f5b
-  data.tar.gz: 7ebb521a7018e5ea544837411ffd4c5ed6d5cf4289a183eb0db6a8ffe40f0ae74c7dee332829348fa43fa2466b0d0272ea89f4616aa8605508a44c5df03eb92e
+  metadata.gz: 7e174e6998ad43ae8c473edf8203c59e4527c1bb547059e67579735d591e071f8f105fa7538e4ff887086ac53b78884f2328a7be7ef266cbf618211d62ea1f2f
+  data.tar.gz: 163973763fce1b3e09c04a92e7c64c06f177e9e224e2b773083773cb50ba26723d3a52aa98a499740d7e8d0dbdef092507c7abec7d5e6477e386dcff65bce937

data/bin/ordinare

@@ -5,5 +5,5 @@ require "ordinare"
 if ARGV.size > 0
   Ordinare.parse_args
 else
-  Ordinare.sort
+  Ordinare::Sort.sort_gemfile
 end

data/lib/ordinare.rb

@@ -1,4 +1,6 @@
 require "ordinare/version"
+require "ordinare/sort"
+require "ordinare/check"
 require "optparse"
 
 module Ordinare
@@ -13,6 +15,7 @@ module Ordinare
     overwrite = true
     version = nil
     help = nil
+    check = nil
 
     OptionParser.new do |opts|
       opts.banner = "Usage: ordinare inside your Rails project"
@@ -27,6 +30,10 @@ module Ordinare
         overwrite = false
       end
 
+      opts.on("-c", "--check", "Check if Gemfile is sorted properly") do
+        check = true
+      end
+
       opts.on("-v", "--version", "Check gem version") do
         puts Ordinare::VERSION
         version = true
@@ -38,64 +45,13 @@ module Ordinare
       end
     end.parse!
 
-    Ordinare.sort(overwrite, path) unless version || help
-  end
-
-  def sort(overwrite = true, path = "Gemfile")
-    unless File.file?(path)
-      abort("No Gemfile found in the current directory, is this a Rails project with Gemfile?")
-    end
-
-    content = File.readlines(path)
+    return if version || help
 
-    ranges_to_sort = find_ranges_of_gems(content)
-
-    ranges_to_sort.each do |range|
-      content[range[:start_index]..range[:end_index]] =
-        content[range[:start_index]..range[:end_index]].sort
-    end
-
-    path = "#{path}.ordinare" unless overwrite
-
-    File.open(path, "w+") do |file|
-      content.each { |line| file.puts(line) }
-    end
-
-    puts "Your sorted Gemfile can be found at #{path} path"
-  end
-
-  def find_ranges_of_gems(content)
-    gems = content.each_with_index.map do |line, index|
-      if line.strip.start_with?("gem ")
-        index
-      end
-    end
-
-    ranges_to_sort = []
-    gems.each_with_index do |gem, index|
-      current_range = if ranges_to_sort.last && !ranges_to_sort.last[:end_index]
-                        ranges_to_sort.last
-                      else
-                        { :start_index => nil, :end_index => nil }
-                      end
-      start_index = current_range[:start_index]
-      end_index = current_range[:end_index]
-
-      if gem && !gems[index - 1] && gems[index + 1]
-        current_range[:start_index] = index
-        current_range[:end_index] = index if index == gems.length - 1
-
-        ranges_to_sort << current_range unless ranges_to_sort.any? { |range| range[:start_index] == index }
-      elsif gem && gems[index - 1] && !gems[index + 1]
-        ranges_to_sort.map do |range|
-          if range[:start_index] == start_index
-            range[:end_index] = index
-          end
-
-          range
-        end
-      end
+    if check
+      Ordinare::Check.gemfile_sorted?(path)
+    else
+      puts path
+      Ordinare::Sort.sort_gemfile(overwrite, path)
     end
-    ranges_to_sort
   end
 end

data/lib/ordinare/check.rb

@@ -0,0 +1,28 @@
+module Ordinare
+  class Check
+    def self.gemfile_sorted?(path = "Gemfile")
+      new(path).gemfile_sorted?
+    end
+
+    def initialize(path)
+      @path = path
+    end
+
+    def gemfile_sorted?
+      unless File.file?(@path)
+        abort "No Gemfile found in the current directory, is this a Rails project with Gemfile?"
+      end
+
+      ordered_content = Ordinare::Sort.sort_content(@path, File.readlines(@path))
+
+      read_content = File.readlines(@path)
+
+      if read_content == ordered_content
+        puts "Gemfile is sorted properly"
+        true
+      else
+        abort "Gemfile is not sorted"
+      end
+    end
+  end
+end

data/lib/ordinare/sort.rb

@@ -0,0 +1,85 @@
+module Ordinare
+  class Sort
+    def self.sort_gemfile(overwrite = true, path = "Gemfile")
+      new(overwrite, path).sort_gemfile
+    end
+
+    def self.sort_content(path = "Gemfile", content)
+      new(false, path).sort_content(content)
+    end
+
+    def initialize(overwrite, path)
+      @overwrite = overwrite
+      @read_path = path
+      @write_path = overwrite ? @read_path : "#{path}.ordinare"
+    end
+
+    def sort_gemfile
+      unless File.file?(@read_path)
+        abort "No Gemfile found in the current directory, is this a Rails project with Gemfile?"
+      end
+
+      read_content = File.readlines(@read_path)
+
+      ordered_content = sort_content(read_content)
+
+      write_to_a_file(ordered_content)
+    end
+
+    def sort_content(content)
+      ranges_to_sort = find_ranges_of_gems(content)
+
+      ranges_to_sort.each do |range|
+        content[range[:start_index]..range[:end_index]] =
+          content[range[:start_index]..range[:end_index]].sort
+      end
+
+      content
+    end
+
+    private
+
+    def find_ranges_of_gems(content)
+      gems = content.each_with_index.map do |line, index|
+        if line.strip.start_with?("gem ")
+          index
+        end
+      end
+
+      ranges_to_sort = []
+      gems.each_with_index do |gem, index|
+        current_range = if ranges_to_sort.last && !ranges_to_sort.last[:end_index]
+                          ranges_to_sort.last
+                        else
+                          { :start_index => nil, :end_index => nil }
+                        end
+        start_index = current_range[:start_index]
+        end_index = current_range[:end_index]
+
+        if gem && !gems[index - 1] && gems[index + 1]
+          current_range[:start_index] = index
+          current_range[:end_index] = index if index == gems.length - 1
+
+          ranges_to_sort << current_range unless ranges_to_sort.any? { |range| range[:start_index] == index }
+        elsif gem && gems[index - 1] && !gems[index + 1]
+          ranges_to_sort.map do |range|
+            if range[:start_index] == start_index
+              range[:end_index] = index
+            end
+
+            range
+          end
+        end
+      end
+      ranges_to_sort
+    end
+
+    def write_to_a_file(content)
+      File.open(@write_path, "w+") do |file|
+        content.each { |line| file.puts(line) }
+      end
+
+      puts "Your sorted Gemfile can be found at #{@write_path} path"
+    end
+  end
+end

data/lib/ordinare/version.rb

@@ -1,3 +1,3 @@
 module Ordinare
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: ordinare
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Nikola Đuza
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-04 00:00:00.000000000 Z
+date: 2017-08-12 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: codecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -39,6 +53,8 @@ extra_rdoc_files: []
 files:
 - bin/ordinare
 - lib/ordinare.rb
+- lib/ordinare/check.rb
+- lib/ordinare/sort.rb
 - lib/ordinare/version.rb
 homepage: https://github.com/nikolalsvk/ordinare
 licenses: