treet 0.15.0 → 0.17.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 0cbacd421d190cd2d749327de0ee03aaf373d524
+  data.tar.gz: e41405f31af293569faab6ef0ecc8242a01a645f
+SHA512:
+  metadata.gz: f049a44fb96e3b38c7c8c977941bf626715f2029e5499381b946c0414d469ee6457979a95171fe7fd80713333dc8fe9e293ec24d37c97c0412b1c6880599b5ea
+  data.tar.gz: d3a42775c21ee9a641d1b112d94e23056d121957eef76a24889faff5006afac6d98f5b4e216f471e8cebf00ff89b942c3c6fc5895fe0a1a3d68c77f8d3da4289

data/.gitignore

@@ -16,3 +16,4 @@ test/tmp
 test/version_tmp
 tmp
 .irb_history
+TAGS

data/Gemfile

@@ -1,4 +1,6 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in treet.gemspec
+# gem 'rugged', :git => "git@github.com:libgit2/rugged.git", :branch => 'development'
+  #{}"~> 0.18.0.b1"
+
 gemspec

data/Guardfile

@@ -18,11 +18,10 @@ guard 'minitest', test_folders: 'spec', test_file_patterns: 'test_*.rb' do
   # watch(%r|^spec/spec_helper\.rb|)    { "spec" }
 end
 
-guard 'rspec', :version => 2 do
+guard 'rspec' do
   watch(%r{^spec/.+_spec\.rb$})
 
   watch(%r{^lib/treet/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
   watch(%r{^(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec" }
 end
-

data/lib/treet/gitrepo.rb

@@ -1,11 +1,9 @@
-# encoding: UTF-8
-
 require "rugged"
 require "forwardable"
 
 class Treet::Gitrepo < Treet::Repo
   extend Forwardable
-  def_delegators :@gitrepo, :head, :refs, :index
+  def_delegators :@gitrepo, :head, :refs, :index, :remotes
 
   def initialize(path, opts = {})
     raise ArgumentError, "author required for updates" unless opts[:author]
@@ -22,7 +20,7 @@ class Treet::Gitrepo < Treet::Repo
   end
 
   def tags
-    gitrepo.refs(/tags/)
+    gitrepo.refs.select {|ref| ref.name =~ %r{/tags/}}
   end
 
   def tag(tagname, opts = {})
@@ -30,7 +28,7 @@ class Treet::Gitrepo < Treet::Repo
     commit = opts[:commit] || head.target
     if tag_ref = Rugged::Reference.lookup(gitrepo, refname)
       # move an existing tag
-      tag_ref.target = commit
+      tag_ref.set_target(commit)
     else
       # new tag
       Rugged::Reference.create(gitrepo, refname, commit)
@@ -68,13 +66,17 @@ class Treet::Gitrepo < Treet::Repo
     index.entries.map{|e| e[:path]}
   end
 
-  def branches
-    refs(/heads/).map {|ref| ref.name.gsub(/^refs\/heads\//, '')} - ['master']
+  def branches(branchname = nil)
+    if branchname
+      Rugged::Branch.lookup(gitrepo, branchname)
+    else
+      gitrepo.branches.map(&:name) - ['master']
+    end
   end
 
   # always branch from tip of master (private representation)
   def branch(name)
-    Rugged::Reference.create(gitrepo, "refs/heads/#{name}", head.target)
+    gitrepo.create_branch(name)
   end
 
   def tagged?(tagname)
@@ -93,6 +95,10 @@ class Treet::Gitrepo < Treet::Repo
     commit_id_for(tagname) == head.target
   end
 
+  def remote(name)
+    Rugged::Remote.lookup(gitrepo, name)
+  end
+
   private
 
   attr_reader :gitrepo, :author
@@ -157,10 +163,15 @@ class Treet::Gitrepo < Treet::Repo
     end
   end
 
+  # ruby 2.0 changed behavior on empty strings: JSON.load("")
+  # under 1.9.3 and previous, this caused an exception
+  # under 2.0, this just returns nil
   def gitget(obj)
     data = gitrepo.read(obj[:oid]).data
     begin
-      JSON.load(data)
+      v = JSON.load(data)
+      v = obj[:name] if v.nil?
+      v
     rescue JSON::ParserError
       # parser errors are not fatal
       # this just indicates a string entry rather than a hash

data/lib/treet/hash.rb

@@ -1,5 +1,3 @@
-# encoding: UTF-8
-
 require "map"
 require "json"
 require "digest/sha1"
@@ -177,6 +175,7 @@ class Treet::Hash
         end
 
       when Array
+        v2 = v2.map {|e| (Hash === e) ? e.to_hash : e}
         v1.each do |e1|
           if !v2.include?(e1)
             # element has been removed

data/lib/treet/version.rb

@@ -1,3 +1,3 @@
 module Treet
-  VERSION = "0.15.0"
+  VERSION = "0.17.1"
 end

data/spec/lib/hash_spec.rb

@@ -23,6 +23,32 @@ describe Treet::Hash do
     hash.data.keys.should be_empty
   end
 
+  it "should be indifferent to hash element order" do
+    h1 = Treet::Hash.new(:one => [Map.new(:two => 'foo', :three => 'bar')])
+    h2 = Treet::Hash.new(:one => [Map.new(:three => 'bar', :two => 'foo')])
+    h1.should == h2
+    h1.compare(h2).should be_empty
+  end
+
+  it "should be indifferent to array element order" do
+    h1 = Treet::Hash.new(:one => [{:foo => 'bar'}, {:foo => 'baz'}])
+    h2 = Treet::Hash.new(:one => [{:foo => 'baz'}, {:foo => 'bar'}])
+    h1.should == h2
+    h1.compare(h2).should be_empty
+
+    h1 = Treet::Hash.new(:one => [3,5,7,11])
+    h2 = Treet::Hash.new(:one => [7,11,5,3])
+    h1.should == h2
+    h1.compare(h2).should be_empty
+  end
+
+  it "should be indifferent to array order (#2)" do
+    h1 = Treet::Hash.new(:one => [2,4,6])
+    h2 = Treet::Hash.new(:one => [6,4,2])
+    h1.should == h2
+    h1.compare(h2).should be_empty
+  end
+
   it "should compare hashes to file trees" do
     hash = Treet::Hash.new("#{File.dirname(__FILE__)}/../json/one.json")
     repo = Treet::Repo.new("#{File.dirname(__FILE__)}/../repos/one")

data/spec/lib/test_gitrepo.rb

@@ -78,6 +78,7 @@ class GitrepoTests < MiniTest::Spec
 
     it "should have no branches" do
       johnb.branches.must_be_empty
+      johnb.branches('bogus').must_be_nil
     end
 
     it "should return commit SHA for version label" do
@@ -98,8 +99,8 @@ class GitrepoTests < MiniTest::Spec
   end
 
   describe "a gitrepo with an array of strings" do
-    def self.make_repo
-      @repo ||= begin
+    def repo
+      @@repo_with_array ||= begin
         data = {
           "label" => "Rainbow Colors",
           "colors" => %w{red orange yellow green blue purple}
@@ -110,8 +111,6 @@ class GitrepoTests < MiniTest::Spec
       end
     end
 
-    let(:repo) { self.class.make_repo }
-
     it "should fetch directly from file system" do
       repo.to_hash.wont_be_nil
     end
@@ -399,6 +398,7 @@ class GitrepoTests < MiniTest::Spec
 
     it "should show a branch" do
       repo.branches.must_equal ['mybranch']
+      repo.branches('mybranch').wont_be_nil
     end
   end
 

data/treet.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'map'
   gem.add_dependency 'thor'
-  gem.add_dependency 'rugged', "~> 0.17.0.b6"
+  gem.add_dependency 'rugged', "~> 0.19.0"
 
   gem.add_development_dependency "rake"
   gem.add_development_dependency "rspec"

metadata

@@ -1,158 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: treet
 version: !ruby/object:Gem::Version
-  version: 0.15.0
-  prerelease: 
+  version: 0.17.1
 platform: ruby
 authors:
 - Jason May
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-25 00:00:00.000000000 Z
+date: 2013-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: map
   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: thor
   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: rugged
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.17.0.b6
+        version: 0.19.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.17.0.b6
+        version: 0.19.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby_gntp
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Transform between trees of files and JSON blobs
@@ -210,33 +191,26 @@ files:
 - treet.gemspec
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3301508427182722923
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3301508427182722923
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Transform between trees of files and JSON blobs
 test_files:
 - spec/json/bob1.json