lockfile_preserver 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 152d8431a38ce8589fe96c97747d5ceb805cffa4
-  data.tar.gz: f80b6c2c1cf75fa2a310fe2b1fe63f7b5ad0f86e
+  metadata.gz: 1bbb130278a37b895922f1f2684152b36defecf7
+  data.tar.gz: a33a854a9028cbf70baf46c68b64eacac5613f7b
 SHA512:
-  metadata.gz: c94252649df2830bd55397dfd1bf80aac77538a26f179aa15cc1e617ee9428164f6b52e8d6e046fbdc625b10f756c3080ae0cf891262259fb97a813ea72d7724
-  data.tar.gz: b167b692972bbd854d2f8b1ef5231898bff7d7c9ad568151cee9f34102db7403c113a2d259f57852b7f3079971edba95e92d0b07496a054fa390cbf9516c2a28
+  metadata.gz: b917123ac6a7e962d89fa5dc564d69e87c75dd5da7445a2bb95b5527b1d694cfc071d9d6e3af35a958a7d6510b55b0083f699651869d4e7ae976016e211ea403
+  data.tar.gz: 51cfefd14596e786e9dc4765302fcea8f72df7fe23e2522a23356a1b1452e490e5f9cf3dcf4fbaac58fe9a57ffb5ade0970ac18a9e191a4c87b96ef9c00ee220

data/.gitignore

@@ -7,4 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
-Gemfile.lock
+/spec/examples.txt

data/.rspec

@@ -1,3 +1,2 @@
 --require spec_helper
---format documentation
 --color

data/.travis.yml

@@ -3,8 +3,10 @@ cache: bundler
 language: ruby
 bundler_args: --without debugging
 rvm:
+  - 2.3.1
   - 2.3.0
   - 2.2.4
+  - 2.1.9
   - ruby-head
 matrix:
   allow_failures:

data/CHANGELOG.md

@@ -0,0 +1,17 @@
+# CHANGELOG
+
+## Unreleased
+
+## 1.0.1 - 2016.06.02
+
+- Introduce `LockfilePreserver::RubyVersion` [#2][pr2]
+- Introduce `LockfilePreserver::Pipeline` [#2][pr2]
+- Refactor spec fixture originations [#2][pr2]
+- `.keep` now accepts `:ruby_version` to preserve Ruby Version section from the lockfile [#2][pr2]
+- new `.keep_all` method to preserve BUNDLED WITH and RUBY VERSION section from the lockfile [#2][pr2]
+
+[pr2]: https://github.com/jollygoodcode/lockfile_preserver/pull/2
+
+## 1.0.0 - 2016.03.08
+
+Init LockfilePreserver.

data/Gemfile

@@ -7,4 +7,5 @@ group :development do
   gem "bundler"
   gem "rake"
   gem "rspec", "~> 3.4"
+  gem "pry"
 end

data/README.md

@@ -1,5 +1,9 @@
 # LockfilePreserver
 
+[![Gem Version](https://badge.fury.io/rb/lockfile_preserver.svg)](https://badge.fury.io/rb/lockfile_preserver)
+[![Build Status](https://travis-ci.org/jollygoodcode/lockfile_preserver.svg?branch=master)](https://travis-ci.org/jollygoodcode/lockfile_preserver)
+[![Code Climate](https://codeclimate.com/github/jollygoodcode/lockfile_preserver/badges/gpa.svg)](https://codeclimate.com/github/jollygoodcode/lockfile_preserver)
+
 Preserve `BUNDLED_WITH` section of your lockfile!
 
 ## Installation
@@ -20,16 +24,42 @@ Or install it yourself as:
 
 ## Usage
 
+Given a folder where `Gemfile` has some outdated gems:
+
+```
+.
+├── Gemfile
+└── Gemfile.lock
+```
+
 ```ruby
-LockfilePreserver.keep(gemfile, updated_gemfile, :bundled_with)
+lockfile = IO.read "Gemfile.lock"
 ```
 
+Then we do a `bundle update`. The lockfile has been updated:
+
+```ruby
+updated_lockfile = IO.read "Gemfile.lock"
+```
+
+Preserve `BUNDLED_WITH` changes to your lockfile:
+
+```ruby
+LockfilePreserver.keep(lockfile, updated_lockfile)
+```
+
+That's it!
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
+## Credits
+
+A huge THANK YOU to all our [contributors](https://github.com/jollygoodcode/dasherize/graphs/contributors)! :heart:
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/jollygoodcode/lockfile_preserver.
@@ -37,3 +67,9 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/jollyg
 ## The UNLICENSE
 
 See [UNLICENSE](/UNLICENSE).
+
+## Maintained by Jolly Good Code
+
+[![Jolly Good Code](https://cloud.githubusercontent.com/assets/1000669/9362336/72f9c406-46d2-11e5-94de-5060e83fcf83.jpg)](http://www.jollygoodcode.com)
+
+We specialise in rapid development of high quality MVPs. [Hire us](http://www.jollygoodcode.com/#get-in-touch) to turn your product idea into reality.

data/circle.yml

@@ -0,0 +1,3 @@
+test:
+  override:
+    - bundle exec rspec

data/lib/lockfile_preserver/bundled_with.rb

@@ -1,8 +1,8 @@
 module LockfilePreserver
   class BundledWith
-    def initialize(original, current)
+    def initialize(original, updated)
       @original = original
-      @current = current
+      @updated = updated
     end
 
     def keep
@@ -15,7 +15,7 @@ module LockfilePreserver
 
     private
 
-      attr_reader :original, :current
+      attr_reader :original, :updated
 
       BUNDLED_WITH = "BUNDLED WITH".freeze
       REGEXP = %r{\n\nBUNDLED WITH\n\s+(?<version>#{Gem::Version::VERSION_PATTERN})\n*}
@@ -26,11 +26,11 @@ module LockfilePreserver
       private_constant :NEW_LINE
 
       def keep_bundled_with
-        current.sub(REGEXP, bundled_with)
+        updated.sub(REGEXP, bundled_with)
       end
 
       def remove_bundled_with
-        current.sub(REGEXP, NEW_LINE)
+        updated.sub(REGEXP, NEW_LINE)
       end
 
       def bundled_with

data/lib/lockfile_preserver/pipeline.rb

@@ -0,0 +1,21 @@
+module LockfilePreserver
+  class Pipeline
+    def initialize(preservers)
+      @preservers = preservers
+    end
+
+    def call(original, updated)
+      result = updated
+
+      preservers.each do |preserver|
+        result = preserver.new(original, result).keep
+      end
+
+      result
+    end
+
+    private
+
+      attr_reader :preservers
+  end
+end

data/lib/lockfile_preserver/ruby_version.rb

@@ -0,0 +1,46 @@
+module LockfilePreserver
+  class RubyVersion
+    def initialize(original, updated)
+      @original = original
+      @updated = updated
+    end
+
+    def keep
+      if original.include? RUBY_VERSION
+        keep_ruby_version
+      else
+        remove_ruby_version
+      end
+    end
+
+    private
+
+      attr_reader :original, :updated
+
+      RUBY_VERSION = "RUBY VERSION".freeze
+      VERSION_PATTERN = %r{.+}
+      REGEXP = %r{\n\nRUBY VERSION\n\s+(?<version>#{VERSION_PATTERN})\n*}
+      NEW_LINE = "\n".freeze
+
+      private_constant :RUBY_VERSION
+      private_constant :REGEXP
+      private_constant :NEW_LINE
+
+      def keep_ruby_version
+        updated.sub(REGEXP, ruby_version_section)
+      end
+
+      def remove_ruby_version
+        updated.sub(REGEXP, NEW_LINE)
+      end
+
+      def ruby_version_section
+        "\n\nRUBY VERSION\n" \
+        "   #{ruby_version}\n"
+      end
+
+      def ruby_version
+        @_ruby_version ||= original.match(REGEXP)[:version]
+      end
+  end
+end

data/lib/lockfile_preserver/version.rb

@@ -1,3 +1,3 @@
 module LockfilePreserver
-  VERSION = "1.0.0".freeze
+  VERSION = "1.0.1".freeze
 end

data/lib/lockfile_preserver.rb

@@ -1,12 +1,25 @@
 require "lockfile_preserver/version"
+require "lockfile_preserver/pipeline"
 require "lockfile_preserver/bundled_with"
+require "lockfile_preserver/ruby_version"
 
 module LockfilePreserver
   def self.keep(original, updated, section = :bundled_with)
     if section == :bundled_with
       LockfilePreserver::BundledWith.new(original, updated).keep
-    else
-      abort "We currently only support preserve BUNDLED_WITH section of lockfile."
+    elsif section == :ruby_version
+      LockfilePreserver::RubyVersion.new(original, updated).keep
+    elsif
+      abort %(We currently only support preserve "BUNDLED WITH" & "RUBY VERSION" section of lockfile.)
     end
   end
+
+  def self.keep_all(original, updated)
+    pipeline = Pipeline.new [
+      LockfilePreserver::BundledWith,
+      LockfilePreserver::RubyVersion  
+    ]
+
+    pipeline.call(original, updated)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lockfile_preserver
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - JuanitoFatas
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-08 00:00:00.000000000 Z
+date: 2016-06-02 00:00:00.000000000 Z
 dependencies: []
 description: LockfilePreserver preserves section you don't want to update.
 email:
@@ -20,14 +20,18 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - README.md
 - Rakefile
 - UNLICENSE
 - bin/console
 - bin/setup
+- circle.yml
 - lib/lockfile_preserver.rb
 - lib/lockfile_preserver/bundled_with.rb
+- lib/lockfile_preserver/pipeline.rb
+- lib/lockfile_preserver/ruby_version.rb
 - lib/lockfile_preserver/version.rb
 - lockfile_preserver.gemspec
 homepage: https://github.com/jollygoodcode/lockfile_preserver
@@ -50,7 +54,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: LockfilePreserver preserves section you don't want to update.