gollum-rugged_adapter 0.3b → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 681f1982e090a6564d149a492bcca52a729f2847
-  data.tar.gz: ad1568ee08b703c30c9f9f79415fade9da9b81d4
+  metadata.gz: 87745f1aafc4f070e0f1a04a13f4e6fa8c4ca4d0
+  data.tar.gz: 83e14a3b21d9a581e03900bd43d1051d15110044
 SHA512:
-  metadata.gz: 4390808d02e57389b0c86b324030487bf6646fe0d6fb4be975a54edd49183b59736863d765537b9e14adb2ba9d0038011a7a1d7e42fa60248f21022fbcba06ac
-  data.tar.gz: 2b4cf0f1f2f8dc83a1c8461befee408233c436f43c3aca90ac89c47bcdf9a47d236ea743e81ec9323273c6a994837f509f1faa6ffafa492520267d16cb1dd751
+  metadata.gz: b25df8424f190e1cb1456acf98ce6930813d2fba0fa20737fca058ba39fe27f24b008b3616f98494e8ba6d6e2cfb654d9180853e56f20a1a2eda7a3c3ab3b84e
+  data.tar.gz: 44dc7d64157fb8083f9269fbd1a14e8026f89d4becabca7eb7a4ddd08762786bb7eaa8d4e5666bef3ed391c77688ca155b3534a2fe7d4ab2ca1ca9ffe9fa0a88

data/Gemfile

@@ -2,8 +2,6 @@ source 'https://rubygems.org'
 
 gemspec
 gem 'rake', '~> 10.0.3'
-gem "mime-types", "~> 1.15"
-
 gem 'adapter_specs', :git => 'https://github.com/gollum/adapter_specs.git'
 
 group :test do

data/LICENSE

@@ -0,0 +1,21 @@
+(The MIT License)
+
+Copyright (c) Bart Kamphorst, Dawa Ometto
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the 'Software'), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/Rakefile

@@ -0,0 +1,127 @@
+require 'rubygems'
+ 
+task :default => :rspec
+
+require 'rspec/core/rake_task'
+
+def name
+  "rugged_adapter"
+end
+
+def version
+  line = File.read("lib/rugged_adapter/version.rb")[/^\s*VERSION\s*=\s*.*/]
+  line.match(/.*VERSION\s*=\s*['"](.*)['"]/)[1]
+end
+
+# assumes x.y.z all digit version
+def next_version
+  # x.y.z
+  v = version.split '.'
+  # bump z
+  v[-1] = v[-1].to_i + 1
+  v.join '.'
+end
+
+def bump_version
+  old_file = File.read("lib/#{name}/version.rb")
+  old_version_line = old_file[/^\s*VERSION\s*=\s*.*/]
+  new_version = next_version
+  # replace first match of old version with new version
+  old_file.sub!(old_version_line, "    VERSION = '#{new_version}'")
+
+  File.write("lib/#{name}/version.rb", old_file)
+
+  new_version
+end
+
+def date
+  Date.today.to_s
+end
+
+def gemspec
+  "#{name}.gemspec"
+end
+
+def gem_file
+  "gollum-#{name}-#{version}.gem"
+end
+
+def replace_header(head, header_name)
+  head.sub!(/(\.#{header_name}\s*= ').*'/) { "#{$1}#{send(header_name)}'"}
+end
+
+desc "Run specs."
+RSpec::Core::RakeTask.new(:rspec) do |spec|
+  ruby_opts = "-w"
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rspec_opts = ['--backtrace --color']
+end
+
+desc "Update version number and gemspec"
+task :bump do
+  puts "Updated version to #{bump_version}"
+  # Execute does not invoke dependencies.
+  # Manually invoke gemspec then validate.
+  Rake::Task[:gemspec].execute
+  Rake::Task[:validate].execute
+end
+
+desc 'Create a release build'
+task :release => :build do
+  unless `git branch` =~ /^\* master$/
+    puts "You must be on the master branch to release!"
+    exit!
+  end
+  sh "git commit --allow-empty -a -m 'Release #{version}'"
+  sh "git pull --rebase origin master"
+  sh "git tag v#{version}"
+  sh "git push origin master"
+  sh "git push origin v#{version}"
+  sh "gem push pkg/#{name}-#{version}.gem"
+  sh "gem push pkg/#{name}-#{version}-java.gem"
+end
+
+desc 'Publish to rubygems. Same as release'
+task :publish => :release
+
+desc 'Build gem'
+task :build => :gemspec do
+  sh "mkdir -p pkg"
+   sh "gem build #{gemspec}"
+   sh "mv #{gem_file} pkg"
+end
+
+desc 'Update gemspec'
+task :gemspec => :validate do
+  # read spec file and split out manifest section
+  spec = File.read(gemspec)
+  head, manifest, tail = spec.split("  # = MANIFEST =\n")
+
+  # replace name version and date
+  replace_header(head, :name)
+  replace_header(head, :date)
+
+  # determine file list from git ls-files
+  files = `git ls-files`.
+    split("\n").
+    sort.
+    reject { |file| file =~ /^\./ }.
+    reject { |file| file =~ /^(rdoc|pkg|spec|\.gitattributes|Guardfile)/ }.
+    map { |file| "    #{file}" }.
+    join("\n")
+
+  # piece file back together and write
+  manifest = "  s.files = %w(\n#{files}\n  )\n"
+  spec = [head, manifest, tail].join("  # = MANIFEST =\n")
+  File.open(gemspec, 'w') { |io| io.write(spec) }
+  puts "Updated #{gemspec}"
+end
+
+desc 'Validate lib files and version file'
+task :validate do
+  libfiles = Dir['lib/*'] - ["lib/#{name}.rb", "lib/#{name}"]
+  unless libfiles.empty?
+    puts "Directory `lib` should only contain a `#{name}.rb` file and `#{name}` dir."
+    exit!
+  end
+end

data/lib/rugged_adapter/git_layer_rugged.rb

@@ -165,14 +165,13 @@ module Gollum
         results = []
         tree.walk_blobs(:postorder) do |root, entry|
           blob = @repo.lookup(entry[:oid])
-          next if blob.binary?
           count = 0
           blob.content.each_line do |line|
             next unless line.match(/#{Regexp.escape(query)}/i)
             count += 1
           end
           path = options[:path] ? ::File.join(options[:path], root, entry[:name]) : "#{root}#{entry[:name]}"
-          results << {:name => path, :count => count}
+          results << {:name => path, :count => count} unless count == 0
         end
         results
       end

data/lib/rugged_adapter/version.rb

@@ -1,7 +1,7 @@
 module Gollum
   module Lib
     module Git
-      VERSION = '0.3b'
+    VERSION = '0.4'
     end
   end
 end

data/rugged_adapter.gemspec

@@ -0,0 +1,36 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "rugged_adapter/version"
+
+Gem::Specification.new do |s|
+  s.name        = "gollum-rugged_adapter"
+  s.version     = Gollum::Lib::Git::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Bart Kamphorst, Dawa Ometto"]
+  s.email       = ["repotag-dev@googlegroups.com"]
+  s.homepage    = "https://github.com/gollum/rugged_adapter"
+  s.summary     = %q{Adapter for Gollum to use Rugged (libgit2) at the backend.}
+  s.description = %q{Adapter for Gollum to use Rugged (libgit2) at the backend.}
+  s.license	= "MIT"
+
+  s.add_runtime_dependency 'rugged', '~> 0.21.3', '>=0.21.3'
+  s.add_runtime_dependency 'mime-types', '~> 2.6'
+  s.add_development_dependency "rspec", "2.13.0"
+
+  s.files         = Dir['lib/**/*.rb'] + ["README.md", "Gemfile"]
+  s.require_paths = ["lib"]
+
+  # = MANIFEST =
+  s.files = %w(
+    Gemfile
+    LICENSE
+    README.md
+    Rakefile
+    lib/rugged_adapter.rb
+    lib/rugged_adapter/git_layer_rugged.rb
+    lib/rugged_adapter/version.rb
+    rugged_adapter.gemspec
+  )
+  # = MANIFEST =
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gollum-rugged_adapter
 version: !ruby/object:Gem::Version
-  version: 0.3b
+  version: '0.4'
 platform: ruby
 authors:
 - Bart Kamphorst, Dawa Ometto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-06 00:00:00.000000000 Z
+date: 2015-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged
@@ -30,6 +30,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 0.21.3
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -52,10 +66,13 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Gemfile
+- LICENSE
 - README.md
+- Rakefile
 - lib/rugged_adapter.rb
 - lib/rugged_adapter/git_layer_rugged.rb
 - lib/rugged_adapter/version.rb
+- rugged_adapter.gemspec
 homepage: https://github.com/gollum/rugged_adapter
 licenses:
 - MIT
@@ -71,9 +88,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2