libdolt 0.33.5 → 0.33.6

data/.gitignore

@@ -1,3 +1,4 @@
 coverage
 test/reports
 /Gemfile.lock
+pkg

data/Gemfile

@@ -5,3 +5,4 @@ gemspec
 gem "ci_reporter"
 gem "rcov", :platforms => :ruby_18
 gem "simplecov", :platforms => :ruby_19
+gem "simplecov-rcov", :platforms => :ruby_19

data/Rakefile

@@ -1,6 +1,15 @@
 require "rake/testtask"
 require "ci/reporter/rake/minitest"
-require "bundler/gem_tasks"
+begin
+  require "bundler/gem_tasks"
+rescue LoadError => e
+  # The bundler package in RHEL 6's ruby193 SCL will break when attempting to
+  # load vendored thor. Tested on ruby193-rubygem-bundler-1.1.4-3.el6.noarch.
+  if e.message != 'cannot load such file -- thor'
+    raise
+  end
+end
+
 
 Rake::TestTask.new("test") do |test|
   test.libs << "test"

data/lib/libdolt/repository_lookup.rb

@@ -109,6 +109,7 @@ module Dolt
     end
 
     def expand_refs(repository, names, type)
+      names = names.map { |n| ForceUtf8::Encode.encode(n) }
       names.select { |n| n =~ /#{type}/ }.map do |n|
         [n.sub(/^refs\/#{type}\//, ""), repository.rev_parse_oid(n)]
       end

data/lib/libdolt/version.rb

@@ -17,5 +17,5 @@
 #++
 
 module Dolt
-  VERSION = "0.33.5"
+  VERSION = "0.33.6"
 end

data/lib/libdolt.rb

@@ -20,6 +20,7 @@ require "libdolt/disk_repo_resolver"
 require "libdolt/repository_lookup"
 require "libdolt/controller_actions"
 require "libdolt/view"
+require "force_utf8/encode"
 
 module Dolt
   def self.template_dir

data/libdolt.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.add_dependency "htmlentities", "~> 4.3"
   s.add_dependency "json", "~> 1.7"
   s.add_dependency "mime-types", "~> 1.19"
+  s.add_dependency "force_utf8"
 
   s.add_development_dependency "minitest", "~> 2.0"
   s.add_development_dependency "rake", "~> 0.9"

data/test/test_helper.rb

@@ -17,6 +17,8 @@
 #++
 if RUBY_VERSION > "1.9"
   require "simplecov"
+  require "simplecov-rcov"
+  SimpleCov.formatter = SimpleCov::Formatter::RcovFormatter
   SimpleCov.start
 end
 require "bundler/setup"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libdolt
 version: !ruby/object:Gem::Version
-  version: 0.33.5
+  version: 0.33.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-11 00:00:00.000000000 Z
+date: 2013-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged
@@ -107,6 +107,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.19'
+- !ruby/object:Gem::Dependency
+  name: force_utf8
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement