organize_gemfile 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d2b9281b4ed27d214456d4e96e33a6254f8002731df1ad29e947778c93db77f
-  data.tar.gz: f7e1c47f3869d94c961a5dada7e1b151f01b4298a8ba3a54d02206a5d99b0635
+  metadata.gz: 22aa5242f1a189d3cddddb4b6086c50c89d948d18d6cb047dce073d3599399be
+  data.tar.gz: e4f5d8a161d25ee9368a22ec3c20761319702c130abd89462dcc708cf0a54a86
 SHA512:
-  metadata.gz: d6d1f7a14e538d7fb92628e47e3b207ad325932df0ef1dc57e2e8b00e9af22b7c065617d4479f0aa63a96f8337f178cd34a45c630b3f4a74149822344bf76954
-  data.tar.gz: f70ee5720b715078afd079df17410fa6aeff0d331bb5b30504778d934312eef2eb1282842465430a945adbe7330922a8bf7f7149ec3eca346d18e61e5cb55f6e
+  metadata.gz: 6dc94259988d8048341aaa16f096815b92b68fbe6715f6d0898496b1dc58b7c5fc6200c2c8d29d70d557928f1925f5b1f2873cd362442f7e9d4204960ecb10e2
+  data.tar.gz: 6e9e5390bc008577cdaed3fac08c4bc604e11b2a309bf2dd50242319b7d0b23cce999b15043e0e4072af1fae74156b2e3b6520394cbc4a6c3f546c15e0e15fa4

data/CHANGELOG.md

@@ -1,4 +1,7 @@
-## [Unreleased]
+## [0.1.1] - 2022-09-07
+
+- Add `--help` and `--gemfile=` options
+- Overwrite existing Gemfile
 
 ## [0.1.0] - 2022-06-19
 

data/Gemfile

@@ -1,10 +1,8 @@
-# frozen_string_literal: true
-
 source "https://rubygems.org"
+git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-# Specify your gem's dependencies in organize_gemfile.gemspec
-gemspec
-
-gem "rake", "~> 13.0"
-gem "minitest", "~> 5.0"
-gem "standard", "~> 1.3"
+gem "minitest", "~> 5.0" # minitest provides a complete suite of testing facilities supporting TDD, BDD, mocking, and benchmarking
+gem "organize_gemfile" # Organize your Gemfile with annotations
+gem "rake", "~> 13.0" # Rake is a Make-like program implemented in Ruby
+gem "standard", "~> 1.3" # Ruby Style Guide, with linter & automatic code fixer
+gem "bump", "~> 0.6" # Bump is a command line tool to help you version your Ruby projects

data/Gemfile.lock

@@ -1,48 +1,48 @@
-PATH
-  remote: .
-  specs:
-    organize_gemfile (0.1.0)
-
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
-    minitest (5.16.0)
+    bump (0.10.0)
+    json (2.6.2)
+    minitest (5.16.3)
+    organize_gemfile (0.1.1)
     parallel (1.22.1)
-    parser (3.1.2.0)
+    parser (3.1.2.1)
       ast (~> 2.4.1)
     rainbow (3.1.1)
     rake (13.0.6)
     regexp_parser (2.5.0)
     rexml (3.2.5)
-    rubocop (1.29.0)
+    rubocop (1.35.1)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.1.0.0)
+      parser (>= 3.1.2.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.17.0, < 2.0)
+      rubocop-ast (>= 1.20.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.17.0)
+    rubocop-ast (1.21.0)
       parser (>= 3.1.1.0)
-    rubocop-performance (1.13.3)
+    rubocop-performance (1.14.3)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     ruby-progressbar (1.11.0)
-    standard (1.12.0)
-      rubocop (= 1.29.0)
-      rubocop-performance (= 1.13.3)
-    unicode-display_width (2.1.0)
+    standard (1.16.1)
+      rubocop (= 1.35.1)
+      rubocop-performance (= 1.14.3)
+    unicode-display_width (2.2.0)
 
 PLATFORMS
   arm64-darwin-21
 
 DEPENDENCIES
+  bump (~> 0.6)
   minitest (~> 5.0)
-  organize_gemfile!
+  organize_gemfile
   rake (~> 13.0)
   standard (~> 1.3)
 
 BUNDLED WITH
-   2.3.10
+   2.3.17

data/README.md

@@ -1,5 +1,7 @@
 # Organize Gemfile
 
+[![Gem Version](https://badge.fury.io/rb/organize_gemfile.svg)](https://badge.fury.io/rb/organize_gemfile)
+
 Organizize your Gemfile with this gem.
 
 ## Installation

data/Rakefile

@@ -13,6 +13,7 @@ Rake::TestTask.new(:test) do |t|
 end
 
 require "standard/rake"
+require "bump/tasks"
 
 task default: %i[test standard]
 
@@ -20,14 +21,15 @@ task :build do
   system "gem build #{GEM_NAME}.gemspec"
 end
 
-task :install => :build do
+task install: :build do
   system "gem install #{GEM_NAME}-#{GEM_VERSION}.gem"
 end
 
-task :publish => :build do
+task publish: :build do
   system "gem push #{GEM_NAME}-#{GEM_VERSION}.gem"
+  system "gem push --key github --host https://rubygems.pkg.github.com/coderberry #{GEM_NAME}-#{GEM_VERSION}.gem"
 end
 
 task :clean do
   system "rm *.gem"
-end
+end

data/exe/organize_gemfile

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
 require "organize_gemfile"
-puts OrganizeGemfile::execute
+puts OrganizeGemfile.execute ARGV

data/lib/organize_gemfile/builder.rb

@@ -6,7 +6,7 @@ module OrganizeGemfile
       @gemfile_path = gemfile_path
       @ruby_version = ruby_version
       @groups = groups
-      new_gemfile_code = build
+      build
     end
 
     def build
@@ -45,4 +45,4 @@ module OrganizeGemfile
       @groups["default"]
     end
   end
-end
+end

data/lib/organize_gemfile/bundle_parser.rb

@@ -38,6 +38,13 @@ module OrganizeGemfile
         spec = specs.key?(dep.name) ? specs[dep.name] : nil
         spec = spec&.to_spec
 
+        version = dep.requirement.to_s
+        if version.nil? || version == "" || version == ">= 0"
+          if spec&.version
+            version = "~> #{spec.version}"
+          end
+        end
+
         {
           name: dep.name,
           summary: spec&.summary,
@@ -47,10 +54,10 @@ module OrganizeGemfile
           branch: dep.branch,
           platforms: dep.platforms,
           gemfile: dep.gemfile,
-          version: dep.requirement.to_s,
+          version: version,
           source: dep.source,
           requires: @requires[dep.name],
-          appear_at_top: @requires[dep.name].include?("dotenv/rails-now")
+          appear_at_top: dep.name.include?("dotenv/rails-now")
         }
       end
     end

data/lib/organize_gemfile/gemfile_group.rb

@@ -20,9 +20,21 @@ module OrganizeGemfile
       spec_lines = specs.sort_by { |s| s[:name] }.map do |spec|
         parts = []
         parts << "gem \"#{spec[:name]}\""
-        parts << "\"#{spec[:version]}\"" if spec[:version] && spec[:version] != ">= 0"
-        parts << "require: \"#{spec[:requires].first}\"" if spec[:requires].first && spec[:requires].first != spec[:name]
+
+        if spec[:version] && spec[:version] != ">= 0"
+          version_parts = []
+          spec[:version].split(",").each do |version|
+            version_parts << "\"#{version.strip}\""
+          end
+          parts << version_parts.join(", ")
+        end
+
+        require_name = spec[:requires]&.first
+        if require_name != spec[:name] && !require_name.nil? && require_name != ""
+          parts << "require: \"#{require_name}\""
+        end
         parts << "require: false" if spec[:requires] == []
+        parts << "path: \"#{spec[:source].path}\"" if spec[:source]
         parts << "platforms: %i[ #{spec[:platforms].join(" ")} ]" if spec[:platforms].any?
         line = parts.join(", ")
 
@@ -40,6 +52,9 @@ module OrganizeGemfile
         if spec[:summary]
           line = line.ljust(max_length)
           line += " # #{spec[:summary]}"
+          if spec[:homepage]
+            line += " [#{spec[:homepage]}]"
+          end
         end
         lines << indent_spaces + line
       end

data/lib/organize_gemfile/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module OrganizeGemfile
-  VERSION = "0.1.0"
+  VERSION = "0.1.2"
 end

data/lib/organize_gemfile.rb

@@ -1,16 +1,29 @@
 # frozen_string_literal: true
 
-require_relative "organize_gemfile/bundle_parser.rb"
-require_relative "organize_gemfile/gemfile_group.rb"
-require_relative "organize_gemfile/builder.rb"
+require_relative "organize_gemfile/bundle_parser"
+require_relative "organize_gemfile/gemfile_group"
+require_relative "organize_gemfile/builder"
 require_relative "organize_gemfile/version"
+require "optparse"
 
 module OrganizeGemfile
-  class Error < StandardError; end
+  class Error < StandardError
+  end
+
+  def self.execute(*args)
+    options = parse_options(args)
+
+    gemfile_path = options[:gemfile] ||= File.expand_path("Gemfile")
+    unless File.exist?(gemfile_path)
+      puts "Gemfile not found at #{gemfile_path}"
+      return
+    end
 
-  def self.execute
-    gemfile_path = File.expand_path("Gemfile")
-    raise "Gemfile not found" unless File.exist?(gemfile_path)
+    gemfile_lock_path = Pathname.new(gemfile_path).parent.join("Gemfile.lock")
+    unless gemfile_lock_path.exist?
+      puts "Gemfile.lock not found at #{gemfile_lock_path}. Be sure to run `bundle install` before running this command."
+      return
+    end
 
     gemfile_lock_path = File.expand_path("Gemfile.lock")
     raise "Gemfile.lock not found" unless File.exist?(gemfile_lock_path)
@@ -18,7 +31,32 @@ module OrganizeGemfile
     parser = BundleParser.new(gemfile_path, gemfile_lock_path)
     ruby_version = parser.ruby_version
     groups = parser.groups
-    builder = Builder.new(gemfile_path, ruby_version: ruby_version, groups: groups)
-    builder.build
+    builder =
+      Builder.new(gemfile_path, ruby_version: ruby_version, groups: groups)
+    revised_gemfile = builder.build
+
+    File.write(gemfile_path, revised_gemfile)
+
+    puts "Gemfile organized!"
+  end
+
+  def self.parse_options(args)
+    options = {}
+
+    opts = OptionParser.new
+    opts.banner = "Usage: organize_gemfile [options]"
+
+    opts.on("-h", "--help", "Prints this help") do
+      puts opts
+      exit
+    end
+
+    opts.on("-gPATH", "--gemfile=PATH", "Path to Gemfile") do |path|
+      options[:gemfile] = File.expand_path(path)
+    end
+
+    opts.parse!(into: options)
+
+    options
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: organize_gemfile
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Eric Berry
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-06 00:00:00.000000000 Z
+date: 2022-10-02 00:00:00.000000000 Z
 dependencies: []
 description: Organize your Gemfile with annotations
 email:
@@ -32,7 +32,6 @@ files:
 - lib/organize_gemfile/bundle_parser.rb
 - lib/organize_gemfile/gemfile_group.rb
 - lib/organize_gemfile/version.rb
-- organize_gemfile.gemspec
 - sig/organize_gemfile.rbs
 homepage: https://github.com/coderberry/organize_gemfile
 licenses:

data/organize_gemfile.gemspec

@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "lib/organize_gemfile/version"
-
-Gem::Specification.new do |spec|
-  spec.name = "organize_gemfile"
-  spec.version = OrganizeGemfile::VERSION
-  spec.authors = ["Eric Berry"]
-  spec.email = ["eric@berry.sh"]
-
-  spec.summary = "Organize your Gemfile with annotations"
-  spec.description = spec.summary
-  spec.homepage = "https://github.com/coderberry/organize_gemfile"
-  spec.license = "MIT"
-  spec.required_ruby_version = ">= 2.6.0"
-
-  spec.metadata["allowed_push_host"] = "https://rubygems.org"
-
-  spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = spec.homepage
-  spec.metadata["changelog_uri"] = "#{spec.homepage}/CHANGELOG.md"
-
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files = Dir.chdir(File.expand_path(__dir__)) do
-    `git ls-files -z`.split("\x0").reject do |f|
-      (f == __FILE__) || f.match(%r{\A(?:(?:bin|test|spec|features)/|\.(?:git|travis|circleci)|appveyor)})
-    end
-  end
-  spec.bindir = "exe"
-  spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
-  # Uncomment to register a new dependency of your gem
-  # spec.add_dependency "example-gem", "~> 1.0"
-
-  # For more information and examples about making a new gem, check out our
-  # guide at: https://bundler.io/guides/creating_gem.html
-end