bunup 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aecb6c5b9952bc73f6e059f520a6ffb477869fa5c44f4855e92a0de17ab50d6f
-  data.tar.gz: d0d5dc8e96c0866cafb55d380ffd3cb6d9602ba7d40a20ff81ba6312ec30e680
+  metadata.gz: e535e339b0b9521d91a170655c46a6384f459b8f101f07444ad060ae57994dfb
+  data.tar.gz: 3aba273f29f740dc3ed9a4dd9473164488929a51c01ffe90a68a3b3915bc768c
 SHA512:
-  metadata.gz: 85686d9b73831bf4fce8d3d5e6d42ec08011315fef82e5d0ba5eba9c7e9b9541d327e9e3f166699fc2ea4b8fd0cd7d21e17c0caea8094d9574b4e45cef37bcd1
-  data.tar.gz: f0568922bd09be73673b7e678427d9de957c49c2d3360fbec279c3f037ec1a5b35caf9f7189e00f261d513bdb58c9e48fba243e54874b19afaf23360c98e96ce
+  metadata.gz: de8b290a7438ea3b8aa5d3b92c1e37cd44adb7972f67527cc583f19baa101980ab5824bffd1bc6b9cd5c8bcd83bdd0639d4935c21312b939bbe2d9aed0d84df5
+  data.tar.gz: 73d30288f035f24eaeb43dcedb7e9f23c8f3805fb440c425b80b4b001a08a2489b11c0aa9e0331718963a537cd28cb1971d0064a49c0aa7923592617d5a280ac

data/CHANGELOG.md

@@ -0,0 +1,12 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## Unreleased
+
+## [0.2.0](https://github.com/singlebrook/bunup/releases/tag/v0.2.0)
+
+- Support Bundler 2
+- Support gems installed from git sources

data/README.md

@@ -1,5 +1,6 @@
 
 [![Build Status](https://travis-ci.org/singlebrook/bunup.svg?branch=master)](https://travis-ci.org/singlebrook/bunup)
+![Gem](https://img.shields.io/gem/v/bunup.svg)
 
 # Bunup
 
@@ -44,7 +45,7 @@ bunup rake rubocop
 ### Options
 
 * `--all`: Update all outdated gems. This is the default.
-* `-y` `--yes` `--assume-yes`: Answer "yes" to major version update prompts and run non-interactively
+* `-y` `--yes` `--assume-yes [major, git]`: Answer "yes" to major version or git version update prompts and run non-interactively. Defaults to all.
 
 ## Development
 

data/bunup.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.required_ruby_version = '>= 2.1'
 
-  spec.add_development_dependency 'bundler', '~> 1.16'
+  spec.add_development_dependency 'bundler', '>= 1.16', '< 2.1'
   spec.add_development_dependency 'byebug', '~> 9.0'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'

data/lib/bunup/cli.rb

@@ -5,6 +5,10 @@ module Bunup
     E_DIRTY_GEMFILE = 'Gemfile and/or Gemfile.lock has changes that would ' \
         'be overwritten. Please stash or commit your changes before running ' \
         'bunup.'.freeze
+    GIT_REF_UPDATE_WARNING = 'WARNING: %<gem_name>s is installed from a git ' \
+        'repo and is being updated from %<installed_version>s to ' \
+        '%<newest_version>s. This update could include breaking changes. ' \
+        'Continue? [y/N] '.freeze
     MAJOR_VERSION_UPDATE_WARNING_FMT = 'WARNING: %<gem_name>s is being ' \
         'updated from %<installed_version>s to %<newest_version>s. This is ' \
         'a major version update with possible breaking changes. ' \
@@ -36,12 +40,12 @@ module Bunup
     end
 
     def build_gems
-      bundle_outdated.split("\n").map do |line|
+      bundle_outdated.split("\n").map.with_object([]) do |line, gems|
         next unless Bundler::OUTDATED_PATTERN =~ line
 
         match_data = Bundler::OUTDATED_PATTERN.match(line)
-        build_gem(match_data)
-      end.compact
+        gems << build_gem(match_data)
+      end
     end
 
     def bundle_outdated
@@ -76,9 +80,26 @@ module Bunup
     def major_version_update?
       return false if @gem.newest_version.nil? || @gem.installed_version.nil?
 
-      major_version = ->(version) { version.split('.')[0].to_i }
-      major_version.call(@gem.newest_version) >
-        major_version.call(@gem.installed_version)
+      @gem.newest_version.major > @gem.installed_version.major
+    end
+
+    # A major version update has breaking changes, according to Semantic
+    # Versioning (https://semver.org/spec/v2.0.0.html). Let's make sure the
+    # user is aware of that.
+    def prompt_for_git_ref_update
+      print format(
+        GIT_REF_UPDATE_WARNING,
+        gem_name: @gem.name,
+        installed_version: @gem.installed_version,
+        newest_version: @gem.newest_version
+      )
+      if @options[:assume_yes_for_git_update]
+        print "assuming yes\n"
+      else
+        unless STDIN.gets.chomp.casecmp('y').zero?
+          raise ::SystemExit.new(true, 'No update performed')
+        end
+      end
     end
 
     # A major version update has breaking changes, according to Semantic
@@ -91,7 +112,7 @@ module Bunup
         installed_version: @gem.installed_version,
         newest_version: @gem.newest_version
       )
-      if @options.assume_yes
+      if @options[:assume_yes_for_major_version_update]
         print "assuming yes\n"
       else
         unless STDIN.gets.chomp.casecmp('y').zero?
@@ -116,6 +137,7 @@ module Bunup
         @gem = gem
         begin
           prompt_for_major_update if major_version_update?
+          prompt_for_git_ref_update if @gem.installed_from_git?
           update
           commit
         rescue ::SystemExit => e

data/lib/bunup/gem.rb

@@ -14,19 +14,23 @@ module Bunup
 
     def initialize(name: nil, installed_version: nil, newest_version: nil)
       @name = name
-      @installed_version = installed_version
-      @newest_version = newest_version
+      @installed_version = Values::Version.new(installed_version)
+      @newest_version = Values::Version.new(newest_version)
       validate
     end
 
+    def installed_from_git?
+      installed_version.from_git? || newest_version.from_git?
+    end
+
     private
 
     def validate
       abort "Invalid gem name: #{name}" unless valid_name?
-      unless valid_version?(installed_version)
+      unless installed_version.valid?
         abort "Invalid version for #{name}: #{installed_version}"
       end
-      unless valid_version?(newest_version)
+      unless newest_version.valid?
         abort "Invalid version for #{name}: #{newest_version}"
       end
     end
@@ -34,9 +38,5 @@ module Bunup
     def valid_name?
       name =~ NAME_PATTERN
     end
-
-    def valid_version?(version_string)
-      ::Gem::Version.correct?(version_string)
-    end
   end
 end

data/lib/bunup/options.rb

@@ -16,10 +16,25 @@ module Bunup
           options.all = true
         end
 
-        assume_yes_msg = 'Answer "yes" to major version update prompts ' \
-          'and run non-interactively'
-        opts.on('-y', '--yes', '--assume-yes', assume_yes_msg) do
-          options.assume_yes = true
+        assume_yes_msg = 'Answer "yes" to all major or git version update ' \
+          'prompts, or all, and run non-interactively. Defaults to all.'
+        opts.on(
+          '-y', '--yes', '--assume-yes [major, git]',
+          Array,
+          assume_yes_msg
+        ) do |list|
+          if list.nil?
+            options[:assume_yes_for_major_version_update] = true
+            options[:assume_yes_for_git_update] = true
+          else
+            list.each do |version_type|
+              case version_type.strip
+              when 'major'
+                then options[:assume_yes_for_major_version_update] = true
+              when 'git' then options[:assume_yes_for_git_update] = true
+              end
+            end
+          end
         end
 
         opts.on('-h', '--help', 'Prints this help') do

data/lib/bunup/services/validate_git_version.rb

@@ -0,0 +1,21 @@
+module Bunup
+  module Services
+    # Validate that version of gem installed from a git source is valid
+    class ValidateGitVersion
+      # https://stackoverflow.com/questions/468370/a-regex-to-match-a-sha1#468378
+      SHA_REGEX = /\b[0-9a-f]{5,40}\b/.freeze
+
+      def initialize(version_string)
+        @version_string = version_string
+      end
+
+      def perform
+        version, sha = @version_string.split(' ')
+        return false if sha.nil?
+
+        ::Gem::Version.correct?(version) &&
+          sha.match?(SHA_REGEX)
+      end
+    end
+  end
+end

data/lib/bunup/values/version.rb

@@ -0,0 +1,37 @@
+module Bunup
+  module Values
+    # Parse and handle version strings
+    class Version
+      def initialize(version_string)
+        @version_string = version_string
+      end
+
+      def to_s
+        @version_string
+      end
+
+      def major
+        if from_git?
+          # '6.0.0.rc2 b6f1d19' => 6
+          @version_string.split(' ')[0].split('.')[0].to_i
+        else
+          # '6.0.0.rc2' => 6
+          @version_string.split('.')[0].to_i
+        end
+      end
+
+      def from_git?
+        Services::ValidateGitVersion.new(@version_string).perform
+      end
+
+      def nil?
+        @version_string == '' || @version_string.nil?
+      end
+
+      def valid?
+        ::Gem::Version.correct?(@version_string) ||
+          Services::ValidateGitVersion.new(@version_string).perform
+      end
+    end
+  end
+end

data/lib/bunup/version.rb

@@ -1,3 +1,3 @@
 module Bunup
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.2.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bunup
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Jared Beck
@@ -10,22 +10,28 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-02 00:00:00.000000000 Z
+date: 2019-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.16'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.16'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -109,6 +115,7 @@ files:
 - ".gitignore"
 - ".rubocop.yml"
 - ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -125,6 +132,8 @@ files:
 - lib/bunup/options.rb
 - lib/bunup/services/commiter.rb
 - lib/bunup/services/updater.rb
+- lib/bunup/services/validate_git_version.rb
+- lib/bunup/values/version.rb
 - lib/bunup/version.rb
 homepage: https://github.com/singlebrook/bunup
 licenses:
@@ -145,8 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Bundle update and commit to git with one command