restore_bundled_with 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41b5d988c8c3575b8d890a093cc059a67269585f
-  data.tar.gz: a88e716c17b3d8c30af065d95b399428b91dfbe7
+  metadata.gz: af8a858be7e0523b6a271185753b3d615e9a9189
+  data.tar.gz: 0de4d442d934795308181450bdd15b2f76dbe33c
 SHA512:
-  metadata.gz: 2ff8e3a8bae902347bfb3fd6456e56adfdf353b7a1de245a5c027891a6518605baba8e932952fac67c028f0413b6a9dec6c1c59cb3cd84eadbd24fa38c09f61a
-  data.tar.gz: 516c46004b15d944d2590d7f70b2117e5062d850371390f9deada594d2e39facafa19f4a7b5d60ae53619a822deb1058b43033596d7087576c3466af4be769a8
+  metadata.gz: 8c9d3785360cf8485a5536aa2f792aa1e81b8332ccf657f158d56fd7c4a13cc969b60aba5d6bae7035b90886b83bb2ff355ce36f7f3eebbaf2d73e34c3d2e8e3
+  data.tar.gz: 25b8d557fb2a1e51f3e35613a1167db1b1977060ad4e5ebca48adc662ded22524c70ce4bf2b8aa022956f6f4f1b2dde9715ee32fc72cd24ed980051969ab587a

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+<a name"0.2.0"></a>
+## 0.2.0 (2015-06-21)
+
+
 <a name"0.1.0"></a>
 ## 0.1.0 (2015-06-20)
 

data/README.md

@@ -102,10 +102,10 @@ There is no diff, because this restores `BUNDLED WITH` from git repository.
 
 ```text
 Commands:
-  restore-bundled-with delete          # Delete BUNDLED WITH
+  restore-bundled-with delete          # Delete BUNDLED WITH section
   restore-bundled-with fetch           # Fetch BUNDLED WITH section
   restore-bundled-with help [COMMAND]  # Describe available commands or one specific command
-  restore-bundled-with restore         # Restore BUNDLED WITH on Gemfile.lock
+  restore-bundled-with restore         # Restore BUNDLED WITH section in Gemfile.lock
   restore-bundled-with version         # Show the RestoreBundledWith version
 
 Usage:
@@ -126,34 +126,7 @@ Options:
   [--debug], [--no-debug]
   [--verbose], [--no-verbose]
 
-Restore BUNDLED WITH on Gemfile.lock
-
-Usage:
-  restore-bundled-with delete
-
-Options:
-  [--data=DATA]
-  [--file=FILE]
-  [--debug], [--no-debug]
-  [--verbose], [--no-verbose]
-
-Delete BUNDLED WITH
-
-Usage:
-  restore-bundled-with fetch
-
-Options:
-  [--lockfile=LOCKFILE]
-                               # Default: Gemfile.lock
-  [--ref=REF]
-                               # Default: HEAD
-  [--git-path=GIT_PATH]
-                               # Default: .
-  [--git-options=key:value]
-  [--debug], [--no-debug]
-  [--verbose], [--no-verbose]
-
-Fetch BUNDLED WITH section
+Restore BUNDLED WITH section in Gemfile.lock
 ```
 
 ## Installation

data/lib/restore_bundled_with/cli.rb

@@ -17,14 +17,14 @@ module RestoreBundledWith
       end
     end
 
-    desc 'restore', 'Restore BUNDLED WITH on Gemfile.lock'
+    desc 'restore', 'Restore BUNDLED WITH section in Gemfile.lock'
     option :data
     option :file
-    option :lockfile, type: :string, default: Fetch::LOCK_FILE
-    option :ref, type: :string, default: Fetch::REF
-    option :git_path, type: :string, default: Fetch::GIT_PATH
-    option :git_options, type: :hash, default: Fetch::GIT_OPTIONS
-    option :new_line, type: :string, default: Insert::NEW_LINE
+    option :lockfile, type: :string, default: Repository::LOCK_FILE
+    option :ref, type: :string, default: Repository::REF
+    option :git_path, type: :string, default: Repository::GIT_PATH
+    option :git_options, type: :hash, default: Repository::GIT_OPTIONS
+    option :new_line, type: :string, default: Repository::NEW_LINE
     option :debug, type: :boolean, default: false
     option :verbose, type: :boolean, default: false
     def restore
@@ -33,7 +33,7 @@ module RestoreBundledWith
       params = options.dup
       params[:file] = options[:lockfile] if !options[:data] && !options[:file]
       data = read_data(params)
-      lockfile = Restore.new(
+      lock_file = Lock.restore(
         data,
         options[:lockfile],
         options[:ref],
@@ -41,15 +41,14 @@ module RestoreBundledWith
         options[:git_options],
         options[:new_line]
       )
-      lockfile.restore
-      lockfile.write
+      lock_file.write_to(options[:lockfile])
     rescue StandardError => e
       suggest_messages(options)
       raise e
     end
     default_command :restore
 
-    desc 'delete', 'Delete BUNDLED WITH'
+    desc 'delete', 'Delete BUNDLED WITH section'
     option :data
     option :file
     option :debug, type: :boolean, default: false
@@ -58,28 +57,30 @@ module RestoreBundledWith
       setup_logger(options)
 
       data = read_data(options)
-      puts Delete.new(data).delete
+      puts Lock.new(data).delete_bundled_with
     rescue StandardError => e
       suggest_messages(options)
       raise e
     end
 
     desc 'fetch', 'Fetch BUNDLED WITH section'
-    option :lockfile, type: :string, default: Fetch::LOCK_FILE
-    option :ref, type: :string, default: Fetch::REF
-    option :git_path, type: :string, default: Fetch::GIT_PATH
-    option :git_options, type: :hash, default: Fetch::GIT_OPTIONS
+    option :lockfile, type: :string, default: Repository::LOCK_FILE
+    option :ref, type: :string, default: Repository::REF
+    option :git_path, type: :string, default: Repository::GIT_PATH
+    option :git_options, type: :hash, default: Repository::GIT_OPTIONS
+    option :new_line, type: :string, default: Repository::NEW_LINE
     option :debug, type: :boolean, default: false
     option :verbose, type: :boolean, default: false
     def fetch
       setup_logger(options)
-
-      puts Fetch
-        .new(
-          options[:lockfile],
-          options[:ref],
-          options[:git_path],
-          options[:git_options])
+      lock_file = Repository
+                  .new(options[:git_path], options[:git_options])
+                  .fetch_file(
+                    options[:lockfile],
+                    options[:ref],
+                    options[:new_line])
+      puts Lock
+        .new(lock_file)
         .pick
     rescue StandardError => e
       suggest_messages(options)

data/lib/restore_bundled_with/lock.rb

@@ -0,0 +1,62 @@
+module RestoreBundledWith
+  class Lock
+    attr_reader :body
+
+    REGEX_BUNDLED_WITH = /^(?<pick>(?:\r\n|\r|\n)^BUNDLED WITH.*(?:\r\n|\r|\n).+(?:\r\n|\r|\n))/
+
+    def self.insert(text, section)
+      if section && !section.empty?
+        new(text + section)
+      else
+        new(text)
+      end
+    end
+
+    def self.restore(
+      data,
+      lockfile = Repository::LOCK_FILE,
+      ref = Repository::REF,
+      git_path = Repository::GIT_PATH,
+      git_options = Repository::GIT_OPTIONS,
+      new_line = Repository::NEW_LINE
+    )
+      trimmed = new(data).delete_bundled_with
+      lock_file_data = Repository
+                       .new(git_path, git_options)
+                       .fetch_file(lockfile, ref, new_line)
+      section = new(lock_file_data)
+                .pick
+      insert(trimmed.body, section)
+    end
+
+    def initialize(text)
+      @body = text
+    end
+
+    # "\n\nBUNDLED WITH\n   1.10.4\n" => "\n"
+    def delete_bundled_with
+      self.class.new(body.sub(REGEX_BUNDLED_WITH) { '' })
+    end
+
+    def pick
+      match = REGEX_BUNDLED_WITH.match(body)
+      if match
+        match[:pick]
+      else
+        ''
+      end
+    end
+
+    def to_s
+      body
+    end
+
+    def ==(other)
+      body == other.body
+    end
+
+    def write_to(path)
+      File.write(path, body)
+    end
+  end
+end

data/lib/restore_bundled_with/repository.rb

@@ -0,0 +1,24 @@
+module RestoreBundledWith
+  class Repository
+    LOCK_FILE = 'Gemfile.lock'
+    REF = 'HEAD'
+    GIT_PATH = '.'
+    GIT_OPTIONS = {}
+    NEW_LINE = "\n"
+
+    def initialize(git_path = GIT_PATH, git_options = GIT_OPTIONS)
+      @git_path = git_path
+      @git_options = git_options
+    end
+
+    def git
+      @git ||= Git.open(@git_path, @git_options)
+    end
+
+    def fetch_file(file = LOCK_FILE, ref = REF, new_line = NEW_LINE)
+      # NOTE: git.cat_file trims last \n?
+      text = git.cat_file("#{ref}:#{file}")
+      text + new_line
+    end
+  end
+end

data/lib/restore_bundled_with/version.rb

@@ -1,3 +1,3 @@
 module RestoreBundledWith
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/lib/restore_bundled_with.rb

@@ -2,10 +2,8 @@ require 'git'
 require 'logger'
 
 require 'restore_bundled_with/error'
-require 'restore_bundled_with/fetch'
-require 'restore_bundled_with/delete'
-require 'restore_bundled_with/insert'
-require 'restore_bundled_with/restore'
+require 'restore_bundled_with/lock'
+require 'restore_bundled_with/repository'
 require 'restore_bundled_with/version'
 
 module RestoreBundledWith

data/restore_bundled_with.gemspec

@@ -25,6 +25,8 @@ RestoreBundledWith solves these conflicts.
       .reject { |f| f.match(%r{^(test|spec|features)/}) }
       .reject do |f|
       [
+        '.rubocop.yml',
+        '.rubocop_todo.yml',
         '.travis.yml',
         'circle.yml',
         '.tachikoma.yml',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: restore_bundled_with
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - sanemat
@@ -104,8 +104,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".rubocop.yml"
-- ".rubocop_todo.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -120,11 +118,9 @@ files:
 - exe/restore-bundled-with
 - lib/restore_bundled_with.rb
 - lib/restore_bundled_with/cli.rb
-- lib/restore_bundled_with/delete.rb
 - lib/restore_bundled_with/error.rb
-- lib/restore_bundled_with/fetch.rb
-- lib/restore_bundled_with/insert.rb
-- lib/restore_bundled_with/restore.rb
+- lib/restore_bundled_with/lock.rb
+- lib/restore_bundled_with/repository.rb
 - lib/restore_bundled_with/version.rb
 - restore_bundled_with.gemspec
 homepage: https://github.com/packsaddle/ruby-restore_bundled_with

data/.rubocop.yml

@@ -1,8 +0,0 @@
-inherit_from: .rubocop_todo.yml
-
-Style/Documentation:
-  Enabled: false
-Style/FileName:
-  Exclude:
-    - bin/*
-    - exe/*

data/.rubocop_todo.yml

@@ -1,15 +0,0 @@
-# This configuration was generated by `rubocop --auto-gen-config`
-# on 2015-06-20 02:51:10 +0900 using RuboCop version 0.32.0.
-# The point is for the user to remove these configuration records
-# one by one as the offenses are removed from the code base.
-# Note that changes in the inspected code, or installation of new
-# versions of RuboCop, may require this file to be generated again.
-
-Metrics/AbcSize:
-  Exclude:
-    - lib/restore_bundled_with/cli.rb
-
-# Configuration parameters: CountComments.
-Metrics/MethodLength:
-  Exclude:
-    - lib/restore_bundled_with/cli.rb

data/lib/restore_bundled_with/delete.rb

@@ -1,13 +0,0 @@
-module RestoreBundledWith
-  class Delete
-    REGEX_BUNDLED_WITH = /^\n^BUNDLED WITH.*\n.+\n/
-    def initialize(text)
-      @text = text
-    end
-
-    # "\n\nBUNDLED WITH\n   1.10.4\n" => "\n"
-    def delete
-      @text.sub(REGEX_BUNDLED_WITH) { '' }
-    end
-  end
-end

data/lib/restore_bundled_with/fetch.rb

@@ -1,38 +0,0 @@
-module RestoreBundledWith
-  class Fetch
-    LOCK_FILE = 'Gemfile.lock'
-    REF = 'HEAD'
-    GIT_PATH = '.'
-    GIT_OPTIONS = {}
-    # REGEX_PICK = /^(?<pick>\n^BUNDLED WITH.*\n.+\n)/
-    # git.cat_file trims last \n?
-    REGEX_PICK = /^(?<pick>\n^BUNDLED WITH.*\n.+)/
-    def initialize(
-      file = LOCK_FILE,
-      ref = REF,
-      git_path = GIT_PATH,
-      git_options = GIT_OPTIONS)
-      @file = file
-      @ref = ref
-      @git_path = git_path
-      @git_options = git_options
-    end
-
-    def pick
-      match = REGEX_PICK.match(target_file_contents)
-      if match
-        match[:pick]
-      else
-        ''
-      end
-    end
-
-    def target_file_contents
-      git.cat_file("#{@ref}:#{@file}")
-    end
-
-    def git
-      @git ||= ::Git.open(@git_path, @git_options)
-    end
-  end
-end

data/lib/restore_bundled_with/insert.rb

@@ -1,18 +0,0 @@
-module RestoreBundledWith
-  class Insert
-    NEW_LINE = "\n"
-    def initialize(body, section, new_line = NEW_LINE)
-      @body = body
-      @section = section
-      @new_line = new_line
-    end
-
-    def insert
-      if @section && !@section.empty?
-        @body + @section + @new_line
-      else
-        @body
-      end
-    end
-  end
-end

data/lib/restore_bundled_with/restore.rb

@@ -1,39 +0,0 @@
-module RestoreBundledWith
-  class Restore
-    def initialize(
-      data,
-      lockfile = Fetch::LOCK_FILE,
-      ref = Fetch::REF,
-      git_path = Fetch::GIT_PATH,
-      git_options = Fetch::GIT_OPTIONS,
-      new_line = Insert::NEW_LINE
-    )
-      @data = data
-      @lockfile = lockfile
-      @ref = ref
-      @git_path = git_path
-      @git_options = git_options
-      @new_line = new_line
-    end
-
-    def restore
-      data = Delete.new(@data).delete
-      section = Fetch
-                .new(
-                  @lockfile,
-                  @ref,
-                  @git_path,
-                  @git_options)
-                .pick
-      @data = Insert.new(data, section, @new_line).insert
-    end
-
-    def write
-      File.write(@lockfile, @data)
-    end
-
-    def to_s
-      @data
-    end
-  end
-end