treet 0.11.0 → 0.13.1

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.irb_history

data/lib/treet/gitrepo.rb

@@ -37,13 +37,15 @@ class Treet::Gitrepo < Treet::Repo
       end
     rescue Rugged::ReferenceError
       # invalid string for source, e.g. blank or illegal punctuation (colons)
-      raise ArgumentError "invalid source string '#{tagname}' for repository tagging"
+      raise ArgumentError, "invalid source string '#{tagname}' for repository tagging"
     end
   end
 
   def patch(patchdef)
     super
-    add_and_commit!
+    if git_changes?(patchdef)
+      add_and_commit!
+    end
   end
 
   def to_hash(opts = {})
@@ -52,9 +54,8 @@ class Treet::Gitrepo < Treet::Repo
     elsif opts[:tag]
       tag_snapshot(opts[:tag])
     else
-      # snapshot(head.target)
       super()
-    end
+    end.merge(augmentation)
   end
 
   def entries
@@ -62,7 +63,7 @@ class Treet::Gitrepo < Treet::Repo
   end
 
   def branches
-    refs(/heads/).map(&:name) - ['refs/heads/master']
+    refs(/heads/).map {|ref| ref.name.gsub(/^refs\/heads\//, '')} - ['master']
   end
 
   # always branch from tip of master (private representation)
@@ -70,15 +71,22 @@ class Treet::Gitrepo < Treet::Repo
     Rugged::Reference.create(gitrepo, "refs/heads/#{name}", head.target)
   end
 
+  def tagged?(tagname)
+    ! commit_id_for(tagname).nil?
+  end
+
   def version(opts = {})
-    if tag = opts[:tag]
-      ref = Rugged::Reference.lookup(gitrepo, "refs/tags/#{tag}")
-      ref && ref.target
+    if tagname = opts[:tag]
+      commit_id_for(tagname)
     else
       head.target
     end
   end
 
+  def current?(tagname)
+    commit_id_for(tagname) == head.target
+  end
+
   private
 
   attr_reader :gitrepo, :author
@@ -113,6 +121,7 @@ class Treet::Gitrepo < Treet::Repo
   def add_and_commit!
     current_index = entries
     Dir.chdir(root) do
+      # automatically ignores dotfiles
       current_files = Dir.glob('**/*')
 
       # additions
@@ -135,11 +144,22 @@ class Treet::Gitrepo < Treet::Repo
         # `index#remove` handles directories
         index.remove(file)
       end
+
+      index.write
+      tree_sha = index.write_tree
+      commit!(tree_sha)
     end
+  end
 
-    index.write
-    tree_sha = index.write_tree
-    commit!(tree_sha)
+  def gitget(obj)
+    data = gitrepo.read(obj[:oid]).data
+    begin
+      JSON.load(data)
+    rescue JSON::ParserError
+      # parser errors are not fatal
+      # this just indicates a string entry rather than a hash
+      data.empty? ? obj[:name] : data
+    end
   end
 
   def snapshot(commit_sha)
@@ -150,31 +170,39 @@ class Treet::Gitrepo < Treet::Repo
     tree.each do |obj|
       data[obj[:name]] = case obj[:type]
       when :blob
-        begin
-          JSON.load(gitrepo.read(obj[:oid]).data)
-        rescue JSON::ParserError
-          raise JSON::ParserError, "bad JSON in blob #{obj[:name]}: #{gitrepo.read(obj[:oid]).data}"
-        end
+        gitget(obj)
       when :tree
-        begin
-          gitrepo.lookup(obj[:oid]).each_with_object([]) do |subobj,d|
-            d << JSON.load(gitrepo.read(subobj[:oid]).data)
-          end
-        rescue JSON::ParserError
-          raise JSON::ParserError, "bad JSON in tree #{obj[:name]}: #{gitrepo.read(obj[:oid]).data}"
+        gitrepo.lookup(obj[:oid]).each_with_object([]) do |subobj,d|
+          d << gitget(subobj)
         end
       else
         raise TypeError, "UNRECOGNIZED GIT OBJECT TYPE #{obj[:type]}"
       end
     end
 
-    # decorate(data)
     data
   end
 
+  def commit_id_for(tagname)
+    (ref = Rugged::Reference.lookup(gitrepo, "refs/tags/#{tagname}")) && ref.target
+  end
+
   def tag_snapshot(tagname)
-    tag_ref = Rugged::Reference.lookup(gitrepo, "refs/tags/#{tagname}")
-    raise ArgumentError, "tag '#{tagname}' does not exist in this repo" unless tag_ref
-    snapshot(tag_ref.target)
+    if commitid = version(:tag => tagname)
+      snapshot(commitid)
+    else
+      # this tag does not appear in the repo; this is NOT an exception
+      {}
+    end
+  end
+
+  def augmentation(path = root)
+    dotfiles = Dir.entries(path).select {|f|  f =~ /^\./ && f !~ /^(\.|\.\.|\.git)$/}
+    dotfiles.each_with_object({}) {|f,h| h[f] = expand_json("#{path}/#{f}")}
+  end
+
+  # any patches in here that affect anything that must be recorded in git?
+  def git_changes?(patchdef)
+    patchdef.find {|p| p[1] =~ /^[^.]/}
   end
 end

data/lib/treet/repo.rb

@@ -27,7 +27,8 @@ class Treet::Repo
       [keyname, '', nil]
     elsif keyname =~ /\./
       # subelement
-      filename,field = keyname.split('.')
+      # negative lookbehind; don't split on a dot at beginning of string
+      filename,field = keyname.split(/(?<!^)\./)
       ['.', filename, field]
     else
       ['.', keyname]
@@ -143,7 +144,10 @@ class Treet::Repo
   end
 
   def expand(path)
-    files = Dir.entries(path).select {|f|  f !~ /^\./}
-    files.each_with_object({}) {|f,h| h[f] = expand_json("#{path}/#{f}")}
+    filenames(path).each_with_object({}) {|f,h| h[f] = expand_json("#{path}/#{f}")}
+  end
+
+  def filenames(path)
+    Dir.entries(path).select {|f|  f !~ /^\./}
   end
 end

data/lib/treet/version.rb

@@ -1,3 +1,3 @@
 module Treet
-  VERSION = "0.11.0"
+  VERSION = "0.13.1"
 end

data/spec/lib/test_gitrepo.rb

@@ -1,6 +1,5 @@
 # encoding: UTF-8
 require "test_helper"
-require "pp"
 
 # convert a hash to a gitrepo
 # convert a plain repo to a gitrepo
@@ -42,13 +41,18 @@ describe Treet::Gitrepo do
         }
         thash = Treet::Hash.new(data)
         trepo = thash.to_repo(Dir.mktmpdir('repo', $topdir))
-        Treet::Gitrepo.new(trepo.root, :author => {:name => 'Bob', :email => 'bob@example.com'})
+        r = Treet::Gitrepo.new(trepo.root, :author => {:name => 'Bob', :email => 'bob@example.com'})
+        r.patch([]) # should be no-op, trigger no commit
+        r
       end
     end
 
     let(:johnb) { self.class.make_johnb }
 
     it "should have exactly one commit" do
+      Dir.chdir(johnb.root) do
+        `git log --oneline`.lines.count.must_equal 1
+      end
       johnb.head.wont_be_nil
       johnb.refs.count.must_equal 1
       johnb.refs.first.target.must_equal johnb.head.target
@@ -69,10 +73,6 @@ describe Treet::Gitrepo do
       johnb.tags.must_be_empty
     end
 
-    it "should fail on unknown tag lookups" do
-      ->{johnb.to_hash(:tag => 'nosuchtag')}.must_raise ArgumentError
-    end
-
     it "should have no branches" do
       johnb.branches.must_be_empty
     end
@@ -81,8 +81,43 @@ describe Treet::Gitrepo do
       johnb.version.must_equal johnb.head.target
     end
 
-    it "should return nil for unknown tag versions" do
-      johnb.version(:tag => 'nosuchtag').must_be_nil
+    describe "an unknown tag" do
+      it "should have no commit" do
+        johnb.version(:tag => 'nosuchtag').must_be_nil
+      end
+      it "should not be present" do
+        refute johnb.tagged?('nosuchtag')
+      end
+      it "should return empty data" do
+        assert johnb.to_hash(:tag => 'nosuchtag').empty?
+      end
+    end
+  end
+
+  describe "a gitrepo with an array of strings" do
+    def self.make_repo
+      @repo ||= begin
+        data = {
+          "label" => "Rainbow Colors",
+          "colors" => %w{red orange yellow green blue purple}
+        }
+        thash = Treet::Hash.new(data)
+        trepo = thash.to_repo(Dir.mktmpdir('repo', $topdir))
+        Treet::Gitrepo.new(trepo.root, :author => {:name => 'Bob', :email => 'bob@example.com'})
+      end
+    end
+
+    let(:repo) { self.class.make_repo }
+
+    it "should fetch directly from file system" do
+      repo.to_hash.wont_be_nil
+    end
+
+    it "should fetch via git" do
+      data = repo.to_hash(:commit => repo.head.target)
+      data.wont_be_nil
+      assert data['label'] == 'Rainbow Colors'
+      assert data['colors'].to_set == %w{red orange yellow green blue purple}.to_set
     end
   end
 
@@ -191,7 +226,7 @@ describe Treet::Gitrepo do
           :xrefkey => 'app1',
           :xref => 'APP1_ID'
         )
-        r.tag('app1')
+        r.tag('pre-edit')
         r.patch([
           [
             "-",
@@ -220,24 +255,31 @@ describe Treet::Gitrepo do
       repo.index.count.must_equal 2
     end
 
-    it "should have tag not pointing to HEAD" do
+    it "should have one tag" do
       repo.tags.count.must_equal 1
-      repo.tags.first.name.must_equal "refs/tags/app1"
-      repo.tags.first.target.wont_equal repo.head.target
-    end
-
-    it "should have the original image for the tag" do
-      refute hashalike(repo.to_hash, repo.to_hash(:tag => 'app1'))
-      assert hashalike(repo.to_hash(:tag => 'app1'), load_json('two'))
     end
 
     it "should have no branches" do
       repo.branches.must_be_empty
     end
 
-    it "should track version label by tag" do
-      repo.version.must_equal repo.head.target
-      repo.version(:tag => 'app1').must_equal repo.tags.first.target
+    describe "head state" do
+      it "should track version label by tag" do
+        assert repo.version == repo.head.target
+      end
+    end
+
+    describe "pre-patch state" do
+      it "should not be same as HEAD" do
+        assert repo.tagged?("pre-edit")
+        refute repo.current?("pre-edit")
+        assert repo.version(:tag => "pre-edit") != repo.version
+      end
+
+      it "should have the original image" do
+        refute hashalike(repo.to_hash, repo.to_hash(:tag => 'pre-edit'))
+        assert hashalike(repo.to_hash(:tag => 'pre-edit'), load_json('two'))
+      end
     end
   end
 
@@ -251,6 +293,8 @@ describe Treet::Gitrepo do
     it "should have tags" do
       repo.tags.count.must_equal 1
       repo.tags.first.name.must_equal "refs/tags/source1"
+      assert repo.tagged?("source1")
+      assert repo.current?("source1")
     end
 
     it "should have no branches" do
@@ -330,6 +374,9 @@ describe Treet::Gitrepo do
       versions = ['app1', 'app2', 'app3', 'app4'].map {|s| repo[:repo].version(:tag => s)}
       versions.uniq.count.must_equal 4
     end
+
+    it "should know which tag matches the HEAD state" do
+    end
   end
 
   describe "a branched gitrepo" do
@@ -340,7 +387,44 @@ describe Treet::Gitrepo do
     end
 
     it "should show a branch" do
-      repo.branches.must_equal ['refs/heads/mybranch']
+      repo.branches.must_equal ['mybranch']
+    end
+  end
+
+  describe "repo with non-gitified attributes" do
+    let(:repo) do
+      @data = {'foo' => 'bar', '.attr' => {'key' => 'value'}}
+      thash = Treet::Hash.new(@data)
+      trepo = thash.to_repo(Dir.mktmpdir('repo', $topdir))
+      r = Treet::Gitrepo.new(trepo.root, :author => {:name => 'Bob', :email => 'bob@example.com'})
+      r.tag('testing')
+      r.patch([["~", ".attr.key", "newvalue"]])
+      @updated = {'foo' => 'bar', '.attr' => {'key' => 'newvalue'}}
+      r
+    end
+
+    it "should retrieve all attributes" do
+      repo.to_hash.must_equal @updated
+    end
+
+    it "should not create new commits for edits to dot attributes" do
+      Dir.chdir(repo.root) do
+        `git log --oneline`.lines.count.must_equal 1
+      end
+    end
+
+    it "should retrieve non-gitified attrs even via tags and commits" do
+      repo.to_hash(:tag => 'testing').must_equal @updated
+      repo.to_hash(:commit => repo.version(:tag => 'testing')).must_equal @updated
+      repo.to_hash(:commit => repo.version).must_equal @updated
+    end
+
+    it "should not commit the dot-prefixed attributes" do
+      Dir.chdir(repo.root) do
+        gitified = `git ls-tree --name-only HEAD`
+        gitified.must_include('foo')
+        gitified.wont_include('.attr')
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: treet
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.13.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-11 00:00:00.000000000 Z
+date: 2013-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -206,7 +206,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2853716979805169129
+      hash: 1191802132244638868
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -215,7 +215,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2853716979805169129
+      hash: 1191802132244638868
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24