git_dump 0.1.0 → 0.1.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZDRlN2E3ZTg5MmUzZWI5M2IxNjhjYzU0Y2Y3ZmQ2YWZiYzU3MTcwMg==
-  data.tar.gz: !binary |-
-    MThmYjAxMzY5NGI3Yzg4YjU5ODg3ZDQwOTBlYTQ1MTJmOGYwZDk0Yw==
+SHA256:
+  metadata.gz: 68a7d19a624eb19faef3d2cfee530421b2f95e7eb2712cbc0495db02abf8faf9
+  data.tar.gz: 330a3e791b620109a7695fa2fced5c4d14b67b65d44326154041055a4f1d52ee
 SHA512:
-  metadata.gz: !binary |-
-    YTA2NjUwNWNmNDU4NDVhNDNjYzUxN2U1ZDFkODg5N2I2YzY4MmE0MGI5OGYy
-    Zjk2OGI3YzYxZTQ4NWY1NTFmYzRiNzgxNmQ0NzZiYTE3ZGNkZjgxOWE0ODMw
-    ZDgyMDhkZGFjNWFhM2IyNWE5MDVmMTI2MmE3OGUzMDMxZGQ3N2Q=
-  data.tar.gz: !binary |-
-    N2RiOTIxY2Y3ZTgxOWM2MTYzOTMyNWNlNDhiMGNiYjBhNzNlYzM3ZDk2NGFk
-    MzdiN2RmODBjZmE2NGU2Nzk3MThmYzJlYjM4NWU2NDEyNWE1ZjcwMDdmZDMz
-    NWQ2YzJiMzUzNzg5OTRhYjMyNmQ4NzEwMTlmMWVkNGRlZGVkYzA=
+  metadata.gz: 3ee4d7241b044160c50eefdefd1dd98809edea36422f33cb3c0f7a9c1bd71b41e30dfe67b27e339d46079c9f849246c9d96868d1cd4cbb65686b32b8a543a448
+  data.tar.gz: ce5aadd0694dc570940760624d3fd75b46a1bc2a4561ee5ee82b38200bcf53da46d6f8086ad7537bab35c91fbd744348afc0b1e1829b6ebd407d098e03519050

data/.rubocop.yml

@@ -2,61 +2,103 @@ AllCops:
   Exclude:
     - '*.gemspec'
 
-Lint/EndAlignment:
-  AlignWith: variable
+Layout/AccessModifierIndentation:
+  EnforcedStyle: outdent
+
+Layout/CaseIndentation:
+  EnforcedStyle: end
+
+Layout/DotPosition:
+  EnforcedStyle: trailing
+
+Layout/EndAlignment:
+  EnforcedStyleAlignWith: variable
+
+Layout/IndentFirstArrayElement:
+  EnforcedStyle: consistent
+
+Layout/IndentFirstHashElement:
+  EnforcedStyle: consistent
+
+Layout/SpaceBeforeBlockBraces:
+  EnforcedStyle: no_space
+  EnforcedStyleForEmptyBraces: no_space
+
+Layout/SpaceInsideHashLiteralBraces:
+  EnforcedStyle: no_space
+
+Lint/NestedPercentLiteral:
+  Enabled: false
+
+Lint/UnneededSplatExpansion:
+  Enabled: false
 
 Metrics/AbcSize:
   Max: 25
 
+Metrics/BlockLength:
+  Exclude:
+    - 'script/benchmark'
+    - 'spec/**/*.rb'
+
 Metrics/CyclomaticComplexity:
   Max: 10
 
 Metrics/MethodLength:
   Max: 20
 
+Metrics/ModuleLength:
+  Max: 300
+
 Metrics/PerceivedComplexity:
   Max: 8
 
-Style/AccessModifierIndentation:
-  EnforcedStyle: outdent
+Style/Alias:
+  EnforcedStyle: prefer_alias_method
 
 Style/BracesAroundHashParameters:
   Enabled: false
 
-Style/CaseIndentation:
-  IndentWhenRelativeTo: end
-
-Style/DotPosition:
-  EnforcedStyle: trailing
-
 Style/DoubleNegation:
   Enabled: false
 
 Style/Encoding:
-  EnforcedStyle: when_needed
+  Enabled: false
+
+Style/FormatStringToken:
+  Enabled: false
 
 Style/HashSyntax:
   EnforcedStyle: hash_rockets
 
 Style/IfUnlessModifier:
-  MaxLineLength: 40
+  Enabled: false
 
-Style/IndentHash:
-  EnforcedStyle: consistent
+Style/NumericPredicate:
+  EnforcedStyle: comparison
+
+Style/ParallelAssignment:
+  Enabled: false
 
 Style/PercentLiteralDelimiters:
   PreferredDelimiters:
     '%w': '[]'
     '%W': '[]'
 
+Style/SafeNavigation:
+  Enabled: false
+
 Style/Semicolon:
   AllowAsExpressionSeparator: true
 
-Style/SpaceBeforeBlockBraces:
-  EnforcedStyle: no_space
+Style/SignalException:
+  EnforcedStyle: semantic
 
-Style/SpaceInsideHashLiteralBraces:
-  EnforcedStyle: no_space
+Style/TrailingCommaInArguments:
+  EnforcedStyleForMultiline: no_comma
+
+Style/TrailingCommaInArrayLiteral:
+  EnforcedStyleForMultiline: comma
 
-Style/TrailingComma:
+Style/TrailingCommaInHashLiteral:
   EnforcedStyleForMultiline: comma

data/.travis.yml

@@ -1,37 +1,40 @@
+sudo: false
 language: ruby
 rvm:
-  - 1.8.7
-  - 1.9.3
-  - '2.0'
-  - '2.1'
-  - '2.2'
-  - jruby-18mode
-  - jruby-19mode
-  - ree
-script:
-  if [ -n "$RUBOCOP" ]; then
-    bundle exec rubocop
-  ; elif [ -n "$BENCHMARK" ]; then
-    RUGGED=0 bundle exec script/benchmark; RUGGED=1 bundle exec script/benchmark
-  ; else
-    bundle exec rspec
-  ; fi
+  - '1.9.3-p551'
+  - '2.2.10'
+  - '2.3.8'
+  - '2.4.6'
+  - '2.5.5'
+  - '2.6.3'
+  - 'jruby-9.1.9.0'
+script: bundle exec rspec
+before_install:
+  - gem install rubygems-update || gem install rubygems-update --version '< 3'
+  - gem update --system
+  - gem install bundler || gem install bundler --version '< 2'
 env:
-  -
-  - RUGGED=1
+  - DRIVER=git
+  - DRIVER=rugged
 matrix:
-  fast_finish: true
   include:
-    - env: RUBOCOP=true
-      rvm: default
-    - env: BENCHMARK=true RUGGED=1
-      rvm: default
+    - env: RUBOCOP=✓
+      rvm: '2.6.3'
+      script: bundle exec rubocop
+    - env: BENCHMARK=✓
+      rvm: '2.6.3'
+      install: DRIVER=rugged bundle install --jobs=3 --retry=3
+      script:
+        - DRIVER=git bundle exec script/benchmark
+        - DRIVER=rugged bundle exec script/benchmark
+    - env: CHECK_RUBIES=✓
+      rvm: '2.6.3'
+      script: bundle exec travis_check_rubies
   exclude:
-    - rvm: 1.8.7
-      env: RUGGED=1
-    - rvm: jruby-18mode
-      env: RUGGED=1
-    - rvm: jruby-19mode
-      env: RUGGED=1
-    - rvm: ree
-      env: RUGGED=1
+    - rvm: '1.9.3-p551'
+      env: DRIVER=rugged
+    - rvm: 'jruby-9.1.9.0'
+      env: DRIVER=rugged
+  allow_failures:
+    - rvm: 'jruby-9.1.9.0'
+      env: DRIVER=git

data/.travis_check_rubies.yml

@@ -0,0 +1 @@
+exclude: [2.0, 2.1]

data/Gemfile

@@ -1,5 +1,11 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gemspec
 
-gem 'rugged' if ENV['RUGGED'] == '1'
+gem 'rugged', '>= 0.22' if ENV['DRIVER'] == 'rugged'
+
+if RUBY_VERSION >= '2.0'
+  gem 'travis_check_rubies', '~> 0.2', '>= 0.2.3'
+end

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2012-2014 Ivan Kuchin
+Copyright (c) 2012-2019 Ivan Kuchin
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.markdown

@@ -1,8 +1,8 @@
 [![Gem Version](https://img.shields.io/gem/v/git_dump.svg?style=flat)](https://rubygems.org/gems/git_dump)
 [![Build Status](https://img.shields.io/travis/toy/git_dump/master.svg?style=flat)](https://travis-ci.org/toy/git_dump)
-[![Code Climate](https://img.shields.io/codeclimate/github/toy/git_dump.svg?style=flat)](https://codeclimate.com/github/toy/git_dump)
-[![Dependency Status](https://img.shields.io/gemnasium/toy/git_dump.svg?style=flat)](https://gemnasium.com/toy/git_dump)
-[![Inch CI](http://inch-ci.org/github/toy/git_dump.svg?branch=master&style=flat)](http://inch-ci.org/github/toy/git_dump)
+[![Code Climate](https://img.shields.io/codeclimate/maintainability/toy/git_dump.svg?style=flat)](https://codeclimate.com/github/toy/git_dump)
+[![Depfu](https://badges.depfu.com/badges/d6fc5f97912d1efe42933171f333ff16/overview.svg)](https://depfu.com/github/toy/git_dump)
+[![Inch CI](https://inch-ci.org/github/toy/git_dump.svg?branch=master&style=flat)](https://inch-ci.org/github/toy/git_dump)
 
 # git_dump
 
@@ -27,8 +27,8 @@ Create version:
 ```rb
 version = dump.new_version
 version['a/b/c'] = 'string'
-version.store('b/c/d', StringIO.new('string'), 0644)
-version.store('d/e', File.open('path'), 0755)
+version.store('b/c/d', StringIO.new('string'), 0o644)
+version.store('d/e', File.open('path'), 0o755)
 version.store_from('e/f', 'path')
 version.commit(:tags => 'test')
 ```
@@ -72,4 +72,4 @@ dump.fetch(url, ids.first)
 
 ## Copyright
 
-Copyright (c) 2012-2014 Ivan Kuchin. See LICENSE.txt for details.
+Copyright (c) 2012-2019 Ivan Kuchin. See LICENSE.txt for details.

data/git_dump.gemspec

@@ -2,13 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name        = 'git_dump'
-  s.version     = '0.1.0'
+  s.version     = '0.1.1'
   s.summary     = %q{Distributed versioned store using git}
   s.homepage    = "http://github.com/toy/#{s.name}"
   s.authors     = ['Ivan Kuchin']
   s.license     = 'MIT'
 
-  s.rubyforge_project = s.name
+  s.metadata = {
+    'bug_tracker_uri'   => "https://github.com/toy/#{s.name}/issues",
+    'documentation_uri' => "https://www.rubydoc.info/gems/#{s.name}/#{s.version}",
+    'source_code_uri'   => "https://github.com/toy/#{s.name}",
+  }
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
@@ -16,7 +20,7 @@ Gem::Specification.new do |s|
   s.require_paths = %w[lib]
 
   s.add_development_dependency 'rspec', '~> 3.0'
-  if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('1.9.3')
-    s.add_development_dependency 'rubocop', '~> 0.27'
+  if RUBY_VERSION >= '2.1'
+    s.add_development_dependency 'rubocop', '~> 0.52'
   end
 end

data/lib/git_dump.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'git_dump/repo'
 
 require 'forwardable'

data/lib/git_dump/cmd.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'shellwords'
 require 'English'
 
@@ -46,22 +48,23 @@ class GitDump
 
     # Construct command string
     def to_s
-      cmd = args.shelljoin
+      parts = [args.shelljoin]
       if env
         env_str = env.map{ |k, v| "#{k}=#{v}" }.shelljoin
-        cmd = "export #{env_str}; #{cmd}"
+        parts.unshift "export #{env_str};"
       end
-      cmd = "cd #{chdir}; #{cmd}" if chdir
-      cmd << ' < /dev/null' if no_stdin
-      cmd << ' > /dev/null' if no_stdout
-      cmd << ' 2> /dev/null' if no_stderr
-      cmd
+      parts.unshift "cd #{chdir};" if chdir
+      parts.push '< /dev/null' if no_stdin
+      parts.push '> /dev/null' if no_stdout
+      parts.push '2> /dev/null' if no_stderr
+      parts.join(' ')
     end
 
     # Run using system
     def run
       success = system(*arguments)
       return true if success
+
       fail Failure, "`#{self}` failed with #{$CHILD_STATUS.exitstatus}"
     end
 
@@ -70,12 +73,24 @@ class GitDump
       if block
         result = IO.popen(arguments, mode, &block)
         return result if $CHILD_STATUS.success?
+
         fail Failure, "`#{self}` failed with #{$CHILD_STATUS.exitstatus}"
       else
         IO.popen(arguments, mode)
       end
     end
 
+    # Write input to pipe and return output
+    def pipe(input)
+      popen(input ? 'r+' : 'r') do |f|
+        if input
+          f.write input
+          f.close_write
+        end
+        f.read
+      end
+    end
+
     # Capture output
     def capture
       popen(&:read)
@@ -107,6 +122,7 @@ class GitDump
     # prepanded and options hash appended
     def arguments
       return to_s if RUBY_VERSION < '1.9' || defined?(JRUBY_VERSION)
+
       options = {}
       options[:chdir] = chdir if chdir
       options[:in] = '/dev/null' if no_stdin

data/lib/git_dump/entry.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'git_dump/path_object'
 
 class GitDump
@@ -6,7 +8,12 @@ class GitDump
     attr_reader :sha, :mode
     def initialize(repo, dir, name, sha, mode)
       super(repo, dir, name)
-      @sha, @mode = sha, (mode & 0100) == 0 ? 0644 : 0755
+      @sha, @mode = sha, (mode & 0o100) == 0 ? 0o644 : 0o755
+    end
+
+    # Get size
+    def size
+      @size ||= repo.size(sha)
     end
 
     # Pipe for reading data

data/lib/git_dump/path_object.rb

@@ -1,8 +1,12 @@
+# frozen_string_literal: true
+
 class GitDump
   # Base class for Tree, Tree::Builder and Entry
   class PathObject
     attr_reader :repo, :path, :name
     def initialize(repo, dir, name)
+      fail ArgumentError, 'Expected Repo' unless repo.is_a?(Repo)
+
       @repo = repo
       @path = dir ? "#{dir}/#{name}" : name if name
       @name = name

data/lib/git_dump/repo.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 begin
   require 'git_dump/repo/rugged'
 rescue LoadError

data/lib/git_dump/repo/git.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'tempfile'
 require 'time'
 
@@ -17,11 +19,10 @@ class GitDump
         # List remote tag names
         def remote_tag_names(url)
           Cmd.git('ls-remote', '--tags', url).stripped_lines.map do |line|
-            if (m = %r!^[0-9a-f]{40}\trefs/tags/(.*)$!.match(line))
-              m[1]
-            else
-              fail "Unexpected: #{line}"
-            end
+            m = %r!^[0-9a-f]{40}\trefs/tags/(.*)$!.match(line)
+            fail "Unexpected: #{line}" unless m
+
+            m[1]
           end
         end
       end
@@ -29,7 +30,7 @@ class GitDump
       # Add blob for content to repository, return sha
       def data_sha(content)
         @data_sha_command ||= git(*%w[hash-object -w --no-filters --stdin])
-        @data_sha_command.popen('r+') do |f|
+        @data_sha_command.popen('rb+') do |f|
           if content.respond_to?(:read)
             f.write(content.read(4096)) until content.eof?
           else
@@ -82,13 +83,7 @@ class GitDump
         args << '-F' << '-' if options[:message]
         args << tree_sha << {:env => env, :no_stdin => !options[:message]}
 
-        git(*args).popen(options[:message] ? 'r+' : 'r') do |f|
-          if options[:message]
-            f.write options[:message]
-            f.close_write
-          end
-          f.read.chomp
-        end
+        git(*args).pipe(options[:message]).chomp
       end
 
       # Create tag for commit_sha with name constructed from name_parts, return
@@ -109,17 +104,18 @@ class GitDump
         args << '-F' << '-' << '--cleanup=verbatim' if options[:message]
         args << name << commit_sha << {:env => env}
 
-        git(*args).popen(options[:message] ? 'r+' : 'r') do |f|
-          if options[:message]
-            f.write options[:message]
-            f.close_write
-          end
-          f.read.chomp
-        end
+        git(*args).pipe(options[:message])
 
         name
       end
 
+      # Return size of object identified by sha
+      def size(sha)
+        @size_pipe ||= git(*%w[cat-file --batch-check]).popen('r+')
+        @size_pipe.puts(sha)
+        @size_pipe.gets.split(' ')[2].to_i
+      end
+
       # Return pipe with contents of blob identified by sha
       def blob_pipe(sha, &block)
         git('cat-file', 'blob', sha).popen('rb', &block)
@@ -161,16 +157,15 @@ class GitDump
       # Each entry is a hash like one for treeify
       def tree_entries(sha)
         git('ls-tree', sha).stripped_lines.map do |line|
-          if (m = /^(\d{6}) (blob|tree) ([0-9a-f]{40})\t(.*)$/.match(line))
-            {
-              :mode => m[1].to_i(8),
-              :type => m[2].to_sym,
-              :sha => m[3],
-              :name => m[4],
-            }
-          else
-            fail "Unexpected: #{line}"
-          end
+          m = /^(\d{6}) (blob|tree) ([0-9a-f]{40})\t(.*)$/.match(line)
+          fail "Unexpected: #{line}" unless m
+
+          {
+            :mode => m[1].to_i(8),
+            :type => m[2].to_sym,
+            :sha => m[3],
+            :name => m[4],
+          }
         end
       end
 
@@ -182,7 +177,7 @@ class GitDump
         %(committerdate:rfc2822)%(*committerdate:rfc2822)%00
         %(contents)%00
         %(*contents)%00
-      ]
+      ].freeze
 
       # Return list of entries per tag ref
       # Each entry is a hash with following keys:
@@ -239,11 +234,12 @@ class GitDump
 
       def git_env(options)
         env = {}
-        [:author, :committer].each do |role|
-          [:name, :email, :date].each do |part|
+        %w[author committer].each do |role|
+          %w[name email date].each do |part|
             value = options[:"#{role}_#{part}"]
             next unless value
-            value = value.strftime('%s %z') if part == :date
+
+            value = value.strftime('%s %z') if part == 'date'
             env["GIT_#{role}_#{part}".upcase] = value
           end
         end
@@ -260,7 +256,7 @@ class GitDump
         out[:mode] = if out[:type] == :tree
           0o040_000
         else
-          (entry[:mode] & 0100) == 0 ? 0o100_644 : 0o100_755
+          (entry[:mode] & 0o100) == 0 ? 0o100_644 : 0o100_755
         end
 
         unless out[:sha] =~ /\A[0-9a-f]{40}\z/

data/lib/git_dump/repo/rugged.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rugged'
 require 'git_dump/repo/git'
 
@@ -32,7 +34,7 @@ class GitDump
       #   :sha  => sha of content
       #   :mode => last three octets of mode
       def treeify(entries)
-        builder = ::Rugged::Tree::Builder.new
+        builder = ::Rugged::Tree::Builder.new(repo)
         entries.map do |entry|
           entry = normalize_entry(entry)
           builder << {
@@ -42,7 +44,12 @@ class GitDump
             :filemode => entry[:mode],
           }
         end
-        builder.write(repo)
+        builder.write
+      end
+
+      # Return size of object identified by sha
+      def size(sha)
+        ::Rugged::Object.new(repo, sha).size
       end
 
       # Return contents of blob identified by sha

data/lib/git_dump/tree.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'git_dump/path_object'
 require 'git_dump/tree/base'
 require 'git_dump/entry'

data/lib/git_dump/tree/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'git_dump/path_object'
 require 'git_dump/entry'
 
@@ -14,7 +16,8 @@ class GitDump
       # block given
       def each(&block)
         return to_enum(:each) unless block
-        @entries.each do |_, entry|
+
+        @entries.each_value do |entry|
           block[entry]
         end
       end
@@ -23,7 +26,8 @@ class GitDump
       # given
       def each_recursive(&block)
         return to_enum(:each_recursive) unless block
-        @entries.each do |_, entry|
+
+        @entries.each_value do |entry|
           if entry.is_a?(Entry)
             block[entry]
           else
@@ -36,6 +40,7 @@ class GitDump
 
       def get_at(parts)
         return unless (entry = @entries[parts.first])
+
         if parts.length == 1
           entry
         elsif entry.is_a?(self.class)
@@ -47,7 +52,7 @@ class GitDump
 
       def parse_path(path)
         path = Array(path).join('/') unless path.is_a?(String)
-        path.scan(/[^\/]+/)
+        path.scan(%r{[^/]+})
       end
     end
   end

data/lib/git_dump/tree/builder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'git_dump/path_object'
 require 'git_dump/entry'
 
@@ -14,7 +16,7 @@ class GitDump
 
       # Store data `content` with mode `mode` at `path`
       # Pass `nil` as content to remove
-      def store(path, content, mode = 0644)
+      def store(path, content, mode = 0o644)
         put_at(parse_path(path), content && repo.data_sha(content), mode)
       end
       alias_method :[]=, :store

data/lib/git_dump/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'git_dump/version/base'
 require 'git_dump/tree'
 
@@ -24,6 +26,8 @@ class GitDump
     attr_reader :repo, :id, :sha, :time
     attr_reader :commit_time, :annotation, :description
     def initialize(repo, id, sha, attributes = {})
+      fail ArgumentError, 'Expected Repo' unless repo.is_a?(Repo)
+
       @repo, @id, @sha = repo, id, sha
       @time = attributes[:time]
       @commit_time = attributes[:commit_time]

data/lib/git_dump/version/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class GitDump
   class Version
     # Common methods in Version and Builder

data/lib/git_dump/version/builder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'git_dump/version'
 require 'git_dump/version/base'
 require 'git_dump/tree/builder'
@@ -10,13 +12,15 @@ class GitDump
 
       attr_reader :repo
       def initialize(repo)
+        fail ArgumentError, 'Expected Repo' unless repo.is_a?(Repo)
+
         @repo = repo
         @tree = Tree::Builder.new(repo, nil, nil)
       end
 
       # Store data `content` with mode `mode` at `path`
       # Pass `nil` as content to remove
-      def store(path, content, mode = 0644)
+      def store(path, content, mode = 0o644)
         tree.store(path, content, mode)
       end
       alias_method :[]=, :store

data/script/benchmark

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 # encoding: UTF-8
+# frozen_string_literal: true
 
 require 'rubygems'
 require 'bundler/setup'
@@ -8,7 +9,7 @@ require 'git_dump'
 require 'benchmark'
 require 'tmpdir'
 
-def measure(label, number = nil, &block)
+def measure(label, number = nil)
   label = "#{label} x#{number}" if number
   label = "#{label}:"
 
@@ -16,7 +17,7 @@ def measure(label, number = nil, &block)
   print label.ljust(30)
   times = Benchmark.measure do
     (number || 1).times do |n|
-      result = block.call(n)
+      result = yield n
     end
   end
   puts " #{times}"

data/spec/git_dump_spec.rb

@@ -1,3 +1,6 @@
+# encoding: UTF-8
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'git_dump'
 require 'tmpdir'
@@ -14,7 +17,7 @@ describe GitDump do
   DATAS = {
     :text => "\r\n\r\nline\nline\rline\r\nline\n\rline\r\n\r\n",
     :binary => 256.times.sort_by{ rand }.pack('C*'),
-  }
+  }.freeze
 
   describe :new do
     let(:path){ File.join(tmp_dir, 'dump') }
@@ -156,8 +159,8 @@ describe GitDump do
     it 'creates and reads version' do
       builder = dump.new_version
       builder['string/x'] = 'test a'
-      builder.store('stringio/x', StringIO.new('test b'), 0644)
-      builder.store('io/x', File.open(__FILE__), 0755)
+      builder.store('stringio/x', StringIO.new('test b'), 0o644)
+      builder.store('io/x', File.open(__FILE__), 0o755)
       builder.store_from('path/x', __FILE__)
       built = builder.commit
 
@@ -171,8 +174,8 @@ describe GitDump do
 
       expect(version['string/x'].read).to eq('test a')
       expect(version['stringio/x'].read).to eq('test b')
-      expect(version['io/x'].read).to eq(File.read(__FILE__))
-      expect(version['path/x'].read).to eq(File.read(__FILE__))
+      expect(version['io/x'].read).to eq(File.open(__FILE__, 'rb', &:read))
+      expect(version['path/x'].read).to eq(File.open(__FILE__, 'rb', &:read))
       expect(version['should/not/be/there']).to be_nil
     end
 
@@ -202,6 +205,23 @@ describe GitDump do
       end
     end
 
+    it 'returns size for entries' do
+      datas = [
+        '',
+        '1',
+        '᚛᚛ᚉᚑᚅᚔᚉᚉᚔᚋ ᚔᚈᚔ ᚍᚂᚐᚅᚑ ᚅᚔᚋᚌᚓᚅᚐ᚜',
+      ] + DATAS.values
+
+      builder = dump.new_version
+      datas.each_with_index do |data, i|
+        builder["a/path/#{i}"] = data
+      end
+
+      datas.each_with_index do |data, i|
+        expect(builder["a/path/#{i}"].size).to eq(data.bytesize)
+      end
+    end
+
     it 'cleans paths' do
       builder = dump.new_version
       builder['//aa//fa//'] = 'test a'
@@ -272,8 +292,8 @@ describe GitDump do
         builder
       end
 
-      def recursive_path_n_read(o)
-        o.each_recursive.map do |entry|
+      def recursive_path_n_read(obj)
+        obj.each_recursive.map do |entry|
           [entry.path, entry.read]
         end
       end
@@ -324,7 +344,7 @@ describe GitDump do
         end
       end
 
-      [0644, 0755].each do |mode|
+      [0o644, 0o755].each do |mode|
         it "sets mode to #{mode.to_s(8)}" do
           builder = dump.new_version
           builder.store('a', 'test', mode)
@@ -332,17 +352,17 @@ describe GitDump do
           path = File.join(tmp_dir, 'file')
           builder['a'].write_to(path)
 
-          expect(File.stat(path).mode & 0777).to eq(mode)
+          expect(File.stat(path).mode & 0o777).to eq(mode)
         end
 
         it "fixes mode to #{mode.to_s(8)}" do
           builder = dump.new_version
-          builder.store('a', 'test', mode & 0100)
+          builder.store('a', 'test', mode & 0o100)
 
           path = File.join(tmp_dir, 'file')
           builder['a'].write_to(path)
 
-          expect(File.stat(path).mode & 0777).to eq(mode)
+          expect(File.stat(path).mode & 0o777).to eq(mode)
         end
       end
     end

metadata

@@ -1,52 +1,53 @@
 --- !ruby/object:Gem::Specification
 name: git_dump
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Ivan Kuchin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-08 00:00:00.000000000 Z
+date: 2019-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.27'
+        version: '0.52'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.27'
+        version: '0.52'
 description: 
 email: 
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rubocop.yml
-- .travis.yml
+- ".gitignore"
+- ".rubocop.yml"
+- ".travis.yml"
+- ".travis_check_rubies.yml"
 - Gemfile
 - LICENSE.txt
 - README.markdown
@@ -70,28 +71,29 @@ files:
 homepage: http://github.com/toy/git_dump
 licenses:
 - MIT
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/toy/git_dump/issues
+  documentation_uri: https://www.rubydoc.info/gems/git_dump/0.1.1
+  source_code_uri: https://github.com/toy/git_dump
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: git_dump
-rubygems_version: 2.4.4
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Distributed versioned store using git
 test_files:
 - spec/git_dump_spec.rb
 - spec/spec_helper.rb
-has_rdoc: