organize_gemfile 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e792164dde3e1157e0f179ab1fa026958c556b097436aacbd0bdaf829c52f76
-  data.tar.gz: 3b867429dade0acb09cb736ee9cd069e8265a4fd8f3d5a2b5cee3e15772bc54c
+  metadata.gz: 22aa5242f1a189d3cddddb4b6086c50c89d948d18d6cb047dce073d3599399be
+  data.tar.gz: e4f5d8a161d25ee9368a22ec3c20761319702c130abd89462dcc708cf0a54a86
 SHA512:
-  metadata.gz: f3da6ad4029a3b19f9c1d823906a48f0b267a10a6faedeb082d85025573b8ce671d731852884d0ab72d06178574f077fdd8fae553e5baac8ab238bcf77f07d83
-  data.tar.gz: c0a1e837ff3ad854566c54b6f9593e0cdd4d048cf719055efedd509ca6dbe5d076087a827223cf7e8e9325d873b5d7b083247b1916c4088217259a34c0522614
+  metadata.gz: 6dc94259988d8048341aaa16f096815b92b68fbe6715f6d0898496b1dc58b7c5fc6200c2c8d29d70d557928f1925f5b1f2873cd362442f7e9d4204960ecb10e2
+  data.tar.gz: 6e9e5390bc008577cdaed3fac08c4bc604e11b2a309bf2dd50242319b7d0b23cce999b15043e0e4072af1fae74156b2e3b6520394cbc4a6c3f546c15e0e15fa4

data/Gemfile

@@ -2,7 +2,7 @@ source "https://rubygems.org"
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 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 "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
+gem "bump", "~> 0.6" # Bump is a command line tool to help you version your Ruby projects

data/Gemfile.lock

@@ -5,7 +5,7 @@ GEM
     bump (0.10.0)
     json (2.6.2)
     minitest (5.16.3)
-    organize_gemfile (0.1.0)
+    organize_gemfile (0.1.1)
     parallel (1.22.1)
     parser (3.1.2.1)
       ast (~> 2.4.1)

data/Rakefile

@@ -21,12 +21,13 @@ 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

data/exe/organize_gemfile

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
 require "organize_gemfile"
-puts OrganizeGemfile::execute ARGV
+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,6 +20,7 @@ module OrganizeGemfile
       spec_lines = specs.sort_by { |s| s[:name] }.map do |spec|
         parts = []
         parts << "gem \"#{spec[:name]}\""
+
         if spec[:version] && spec[:version] != ">= 0"
           version_parts = []
           spec[:version].split(",").each do |version|
@@ -27,8 +28,13 @@ module OrganizeGemfile
           end
           parts << version_parts.join(", ")
         end
-        parts << "require: \"#{spec[:requires].first}\"" if spec[:requires].first && spec[:requires].first != spec[:name]
+
+        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(", ")
 
@@ -46,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.1"
+  VERSION = "0.1.2"
 end

data/lib/organize_gemfile.rb

@@ -1,10 +1,10 @@
 # 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/version'
-require 'optparse'
+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
@@ -13,20 +13,20 @@ module OrganizeGemfile
   def self.execute(*args)
     options = parse_options(args)
 
-    gemfile_path = options[:gemfile] ||= File.expand_path('Gemfile')
+    gemfile_path = options[:gemfile] ||= File.expand_path("Gemfile")
     unless File.exist?(gemfile_path)
       puts "Gemfile not found at #{gemfile_path}"
       return
     end
 
-    gemfile_lock_path = Pathname.new(gemfile_path).parent.join('Gemfile.lock')
+    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)
+    gemfile_lock_path = File.expand_path("Gemfile.lock")
+    raise "Gemfile.lock not found" unless File.exist?(gemfile_lock_path)
 
     parser = BundleParser.new(gemfile_path, gemfile_lock_path)
     ruby_version = parser.ruby_version
@@ -35,23 +35,23 @@ module OrganizeGemfile
       Builder.new(gemfile_path, ruby_version: ruby_version, groups: groups)
     revised_gemfile = builder.build
 
-    File.open(gemfile_path, 'w') { |f| f.write(revised_gemfile) }
+    File.write(gemfile_path, revised_gemfile)
 
-    puts 'Gemfile organized!'
+    puts "Gemfile organized!"
   end
 
   def self.parse_options(args)
     options = {}
 
     opts = OptionParser.new
-    opts.banner = 'Usage: organize_gemfile [options]'
+    opts.banner = "Usage: organize_gemfile [options]"
 
-    opts.on('-h', '--help', 'Prints this help') do
+    opts.on("-h", "--help", "Prints this help") do
       puts opts
       exit
     end
 
-    opts.on('-gPATH', '--gemfile=PATH', 'Path to Gemfile') do |path|
+    opts.on("-gPATH", "--gemfile=PATH", "Path to Gemfile") do |path|
       options[:gemfile] = File.expand_path(path)
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: organize_gemfile
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Eric Berry
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-07 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:
@@ -42,7 +41,7 @@ metadata:
   homepage_uri: https://github.com/coderberry/organize_gemfile
   source_code_uri: https://github.com/coderberry/organize_gemfile
   changelog_uri: https://github.com/coderberry/organize_gemfile/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -57,8 +56,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Organize your Gemfile with annotations
 test_files: []

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