version_gemfile 1.0.0 → 1.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 1f2614d58972de1bf90c22e74eb1868ab21072c6f1eb4df96e62a11913ea5192
+  data.tar.gz: 6f5d08f9499e94f00e959305ed7129a7d007e843b7931469dead06556890bddd
+SHA512:
+  metadata.gz: 628aec628069e5b0f54d24546db4da3312b3cf0d16fc9727efd0a399e9c91a383fc1e8bf02f549e5aacae4e90a1c0beebf7a2a96ec4f66e04a4809b815c4b712
+  data.tar.gz: 818828473216383f73cb7f101846364103b99e235f41547039c123d39b724ae325c8e1284f9c6836f4ea0cbd26e8d81acad48c08d0163540ef6e2c98e2e99766

data/.github/dependabot.yml

@@ -0,0 +1,16 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "bundler"
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "daily"
+
+  - package-ecosystem: "github-actions"
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "daily"

data/.github/workflows/ruby.yml

@@ -0,0 +1,31 @@
+name: Running Tests
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ["3.0.3"]
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true
+
+      - name: Run tests
+        run: bundle exec rake
+        env:
+          SPEC_OPTS: "-p"
+
+      - name: Run linter
+        run: bundle exec standardrb

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in version_gemfile.gemspec
 gemspec

data/README.md

@@ -33,8 +33,6 @@ Or install it yourself as:
 
 Simply type `$ version_gemfile` and you're done.
 
-Also, you should consider the [Add Gem](https://github.com/abuiles/add_gem) gem to add gems to your Gemfile.
-
 ## Contributing
 
 1. Fork it

data/Rakefile

@@ -1,6 +1,7 @@
 require "bundler/gem_tasks"
-require 'rspec/core/rake_task'
+require "rspec/core/rake_task"
+require "standard/rake"
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: [:spec, "standard:fix"]

data/bin/version_gemfile

@@ -8,11 +8,19 @@ options = {}
 opt_parser = OptionParser.new do |opts|
   opts.banner = "Usage: version_gemfile [options]"
 
-  opts.on("-g", "--gemfile", "Gemfile path") do |path|
+  opts.on("-g", "--gemfile STRING", "Gemfile path") do |path|
     options[:gemfile] = path
   end
+
+  opts.on("-l", "--gemfile-lock STRING", "Gemfile.lock path") do |path|
+    options[:gemfile_lock] = path
+  end
+
+  opts.on("-q", "--gem-command-quote STRING", "Gem command quote") do |quote|
+    options[:gem_command_quote] = quote
+  end
 end
 
 opt_parser.parse!
 
-VersionGemfile::Versioner.add_versions!(options)
+VersionGemfile::Versioner.add_versions!(options)

data/lib/version_gemfile/version.rb

@@ -1,3 +1,3 @@
 module VersionGemfile
-  VERSION = "1.0.0"
+  VERSION = "1.2.0"
 end

data/lib/version_gemfile/versioner.rb

@@ -1,14 +1,16 @@
-require 'tempfile'
+require "tempfile"
 
 module VersionGemfile
   class Versioner
     attr_reader :lock_contents, :gemfile_content, :options, :lockfile_path,
-                :gemfile_path
+      :gemfile_path, :gem_command_quote
 
     IS_GEM_LINE = /^\s* gem \s+ ['|"] /ix
-    HAS_VERSION  = /^\s*gem \s+ ['|"] \s* [\w|-]+ \s* ['|"]\s*,\s*['|"]/ix
+    HAS_VERSION = /^\s*gem \s+ ['|"] \s* [\w|-]+ \s* ['|"]\s*,\s*['|"]/ix
     GET_GEM_NAME = /^\s*gem \s+ ['|"] \s* ([\w|-]+) \s* ['|"]/ix
-    GET_VERSION_NUMBER = /^\s+[\w|-]+ \s \( ([\w|\.]+) \)/ix
+    GET_VERSION_NUMBER = /^\s+[\w|-]+ \s \( ([\w|.]+) \)/ix
+
+    DEFAULT_GEM_COMMAND_QUOTE = '"'.freeze
 
     def self.add_versions!(options = {})
       new(options).add_versions
@@ -16,15 +18,15 @@ module VersionGemfile
 
     def initialize(options = {})
       @options = normalize_hash(options.clone)
-      @gemfile_path = @options.fetch('gemfile'){ 'Gemfile' }
-      @lockfile_path = "#{@gemfile_path}.lock"
-
-      @lock_contents   = File.read(lockfile_path)
+      @gemfile_path = @options.fetch("gemfile") { "Gemfile" }
+      @lockfile_path = @options.fetch("gemfile_lock") { "#{@gemfile_path}.lock" }
+      @gem_command_quote = @options.fetch("gem_command_quote") { DEFAULT_GEM_COMMAND_QUOTE }
+      @lock_contents = File.read(lockfile_path)
       @gemfile_content = File.readlines(gemfile_path)
       @orig_gemfile = File.read(gemfile_path)
     end
 
-    #TODO: Clean this up!
+    # TODO: Clean this up!
     def add_versions
       new_gemfile = Tempfile.new("Gemfile.versioned")
       begin
@@ -37,11 +39,11 @@ module VersionGemfile
         end
         File.truncate(gemfile_path, 0)
         new_gemfile.rewind
-        File.open(gemfile_path, "w") {|f| f.write(new_gemfile.read)}
-      rescue Exception => e
+        File.write(gemfile_path, new_gemfile.read)
+      rescue => e
         puts "ERROR: #{e}"
         puts "Restoring Gemfile at #{gemfile_path}"
-        File.open(gemfile_path, "w") {|f| f.write(@orig_gemfile)}
+        File.write(gemfile_path, @orig_gemfile)
       ensure
         new_gemfile.close
         new_gemfile.unlink
@@ -52,22 +54,37 @@ module VersionGemfile
       gem_line.match(HAS_VERSION)
     end
 
+    def build_gem_line(gem_line)
+      return gem_line if gem_line.match(HAS_VERSION)
+
+      name = gem_name(gem_line)
+      version = get_version(name)
+
+      return gem_line unless version
+
+      options = gem_line.gsub(GET_GEM_NAME, "").strip
+
+      quote = gem_command_quote || DEFAULT_GEM_COMMAND_QUOTE
+
+      "#{spaces(gem_line)}gem #{quote}#{name}#{quote}, #{quote}~> #{version}#{quote}#{options}"
+    end
+
+    private
+
     def is_gem_line?(gem_line)
       gem_line =~ IS_GEM_LINE
     end
 
-    def build_gem_line(gem_line, version = nil)
-      return gem_line if gem_line.match(HAS_VERSION)
-      gem_name = gem_line.match(GET_GEM_NAME) { $1 }
-      spaces = gem_line.match(/^(\s+)/){ $1 }
-      version ||= get_version(gem_name)
-      "#{spaces}gem '#{gem_name}', '~> #{version}'"
+    def gem_name(gem_line)
+      gem_line.match(GET_GEM_NAME) { $1 }
     end
 
-    private
+    def spaces(gem_line)
+      gem_line.match(/^(\s+)/) { $1 }
+    end
 
     def get_version(gem_name)
-      regexp = /^\s+#{gem_name}\s\(([\w|\.]+)\)/ix
+      regexp = /^\s+#{gem_name}\s\(([\w|.]+)\)/ix
       regexp.match(lock_contents) { $1 }
     end
 
@@ -80,4 +97,4 @@ module VersionGemfile
       hash
     end
   end
-end
+end

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
-require 'bundler'
-require 'version_gemfile'
+require "bundler"
+require "version_gemfile"
 
 Bundler.require(:default, :test, :development)
 
@@ -28,7 +28,6 @@ module SpecHelpers
     support_file_lines "Gemfile.initial.test"
   end
 end
-  
 
 RSpec.configure do |config|
   config.expect_with :rspec do |c|

data/spec/support/Gemfile.final.test

@@ -1,27 +1,28 @@
-source 'http://rubygems.org'
-ruby '1.9.3'
+source "http://rubygems.org"
+ruby "1.9.3"
 
-gem 'rails', '3.2.8'
-gem 'pg', '~> 0.14.1'
-gem 'nokogiri', '~> 1.5.5'
-gem 'jquery-rails', '~> 2.1.3'
-gem 'airbrake', '~> 3.1.6'
-gem 'devise', '~> 2.1.2'
+gem "rails", "3.2.8"
+gem "pg", "~> 0.14.1"
+gem "nokogiri", "~> 1.5.5"
+gem "jquery-rails", "~> 2.1.3"
+gem "airbrake", "~> 3.1.6"
+gem "devise", "~> 2.1.2"
 gem "twitter-bootstrap-rails", "2.1.4"
-gem 'friendly_id', '~> 4.0.8'
-gem 'redcarpet', '~> 2.2.2'
-gem 'rack-timeout', '~> 0.0.3'
-gem 'mixpanel', '~> 3.0.2'
+gem "friendly_id", "~> 4.0.8"
+gem "redcarpet", "~> 2.2.2"
+gem "rack-timeout", "~> 0.0.3"
+gem "mixpanel", "~> 3.0.2"
 gem "rails3_acts_as_paranoid", "~> 0.2.0"
 
 
 group :development, :test do
-  gem 'rspec-rails', '~> 2.11.4'
-  gem 'factory_girl_rails', '~> 4.1.0'
+  gem "rspec-rails", "~> 2.11.4"
+  gem "factory_girl_rails", "~> 4.1.0"
 end
 
 group :assets do
-  gem 'sass-rails',   '~> 3.2.3'
-  gem 'uglifier', '>= 1.0.3'
+  gem "sass-rails",   "~> 3.2.3"
+  gem "uglifier", ">= 1.0.3"
 end
 
+gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]

data/spec/support/Gemfile.initial.test

@@ -1,10 +1,10 @@
-source 'http://rubygems.org'
-ruby '1.9.3'
+source "http://rubygems.org"
+ruby "1.9.3"
 
-gem 'rails', '3.2.8'
+gem "rails", "3.2.8"
 gem "pg"
 gem "nokogiri"
-gem 'jquery-rails'
+gem "jquery-rails"
 gem "airbrake"
 gem "devise"
 gem "twitter-bootstrap-rails", "2.1.4"
@@ -21,7 +21,8 @@ group :development, :test do
 end
 
 group :assets do
-  gem 'sass-rails',   '~> 3.2.3'
-  gem 'uglifier', '>= 1.0.3'
+  gem "sass-rails",   "~> 3.2.3"
+  gem "uglifier", ">= 1.0.3"
 end
 
+gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]

data/spec/version_gemfile/versioner_spec.rb

@@ -1,27 +1,28 @@
-require 'spec_helper'
+require "spec_helper"
 
 module VersionGemfile
   describe Versioner do
-
     describe "#build_gem_line" do
       let(:versioner) { Versioner.new }
+      before { versioner.stub(lock_contents: test_gemfile_lock) }
 
       it "adds a pessimistic version to the gem" do
-        expect(versioner.build_gem_line("gem 'rails'", "45.3.2")).to eql("gem 'rails', '~> 45.3.2'")
-        expect(versioner.build_gem_line('gem "rails"', "45.3.2")).to eql("gem 'rails', '~> 45.3.2'")
-        expect(versioner.build_gem_line('gem "rack-cache"', "5.3.2")).to eql("gem 'rack-cache', '~> 5.3.2'")
+        expect(versioner.build_gem_line("gem 'rails'")).to match(/~>/)
       end
 
       it "adds the version from the Gemfile.lock file" do
-        versioner.stub(lock_contents: test_gemfile_lock)
-        expect(versioner.build_gem_line "gem 'pg'" ).to eql("gem 'pg', '~> 0.14.1'")
+        expect(versioner.build_gem_line("gem 'pg'")).to eql('gem "pg", "~> 0.14.1"')
+        expect(versioner.build_gem_line("gem 'pg', :require => 'hello'")).to eql('gem "pg", "~> 0.14.1", :require => \'hello\'')
+        expect(versioner.build_gem_line("gem 'pg', require: 'hello'")).to eql('gem "pg", "~> 0.14.1", require: \'hello\'')
       end
     end
 
     describe "#add_versions" do
-      let(:options) {{
-        gemfile: File.join(support_dir_path, "Gemfile.initial.test")
-      }}
+      let(:options) {
+        {
+          gemfile: File.join(support_dir_path, "Gemfile.initial.test")
+        }
+      }
 
       let(:versioner) { Versioner.new(options) }
 
@@ -32,7 +33,7 @@ module VersionGemfile
       end
 
       after do
-        File.open(options[:gemfile], "w"){|f| f.write(@original_gemfile)}
+        File.write(options[:gemfile], @original_gemfile)
       end
 
       it "adds versions to the gemfile" do
@@ -56,7 +57,7 @@ module VersionGemfile
         GEMS
 
         gems.split("\n").each do |gem_name|
-          expect(matcher.match_gem(gem_name)).to be_true
+          expect(matcher.match_gem(gem_name)).to be_truthy
         end
       end
 
@@ -68,9 +69,9 @@ module VersionGemfile
         GEMS
 
         gems.split("\n").each do |gem_name|
-          expect(matcher.match_gem(gem_name)).to be_false
+          expect(matcher.match_gem(gem_name)).to be_falsey
         end
       end
     end
   end
-end
+end

data/spec/version_gemfile_spec.rb

@@ -1,5 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe VersionGemfile do
-  
 end

data/version_gemfile.gemspec

@@ -1,22 +1,22 @@
-# -*- encoding: utf-8 -*-
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'version_gemfile/version'
+require "version_gemfile/version"
 
 Gem::Specification.new do |gem|
-  gem.name          = "version_gemfile"
-  gem.version       = VersionGemfile::VERSION
-  gem.authors       = ["Nicolás Hock Isaza"]
-  gem.email         = ["nhocki@gmail.com"]
-  gem.description   = %q{Tool to add version to your Gemfile's gems.}
-  gem.summary       = %q{Prevent future problems dude. Add the versions and move on.}
-  gem.homepage      = ""
+  gem.name = "version_gemfile"
+  gem.version = VersionGemfile::VERSION
+  gem.authors = ["Nicolás Hock Isaza"]
+  gem.email = ["nhocki@gmail.com"]
+  gem.description = "Tool to add version to your Gemfile's gems."
+  gem.summary = "Prevent future problems dude. Add the versions and move on."
+  gem.homepage = ""
 
-  gem.files         = `git ls-files`.split($/)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.files = `git ls-files`.split($/)
+  gem.executables = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
+  gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_development_dependency('rake', '~> 10.0.3')
-  gem.add_development_dependency('rspec', '~> 2.12.0')
+  gem.add_development_dependency("rake", "~> 13.0.6")
+  gem.add_development_dependency("rspec", "~> 3.10.0")
+  gem.add_development_dependency("standard", "~> 1.7.0")
 end

metadata

@@ -1,48 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: version_gemfile
 version: !ruby/object:Gem::Version
-  version: 1.0.0
-  prerelease: 
+  version: 1.2.0
 platform: ruby
 authors:
 - Nicolás Hock Isaza
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-01-16 00:00:00.000000000 Z
+date: 2022-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.0.3
+        version: 13.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.0.3
+        version: 13.0.6
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 3.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 3.10.0
+- !ruby/object:Gem::Dependency
+  name: standard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.7.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.7.0
 description: Tool to add version to your Gemfile's gems.
 email:
 - nhocki@gmail.com
@@ -51,8 +60,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".github/dependabot.yml"
+- ".github/workflows/ruby.yml"
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -70,33 +80,25 @@ files:
 - version_gemfile.gemspec
 homepage: ''
 licenses: []
-post_install_message: 
+metadata: {}
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2288187485407978392
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2288187485407978392
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.23
-signing_key: 
-specification_version: 3
+rubygems_version: 3.2.32
+signing_key:
+specification_version: 4
 summary: Prevent future problems dude. Add the versions and move on.
 test_files:
 - spec/spec_helper.rb

data/.travis.yml

@@ -1,8 +0,0 @@
-language: ruby
-rvm:
-  - 1.9.3
-  - 1.9.2
-  - jruby-19mode
-  - rbx-19mode
-  - ruby-head
-  - jruby-head