treet 0.10.3 → 0.11.0

data/README.md

@@ -85,6 +85,7 @@ are not allowed.
 
 ## TODO
 
+* why is caching built into treet farm? The data on disk could change. Caching doesn't belong here.
 * Enforce limitation on structure depth (top-level elements can contain flat hashes or arrays, nothing else)
 * refac: move diff stuff from hash.rb to Treet::Diff class, to encapsulate the structure of a diff (array of arrays); create methods for hunting for special stuff in a diff
 * Check all exceptions for explicit classes

data/lib/treet/farm.rb

@@ -14,17 +14,17 @@ class Treet::Farm
   end
 
   def repos(opts = {})
-    @repos_cache ||= Dir.glob("#{root}/*").each_with_object({}) do |subdir,h|
+    xrefs.each_with_object({}) do |subdir,h|
       # in a Farm we are looking for repositories under the root
-      if File.directory?(subdir)
-        xref = File.basename(subdir)
-        h[xref] = repotype.new(subdir, opts.merge(:xrefkey => xrefkey, :xref => xref))
-      end
+      h[subdir] = repo(subdir, opts)
     end
   end
 
-  def reset
-    @repos_cache = nil
+  def repo(id, opts = {})
+    repotype.new("#{root}/#{id}", opts)
+  rescue Errno::ENOENT
+    # no such repository exists
+    nil
   end
 
   # export as an array, not as a hash
@@ -58,10 +58,6 @@ class Treet::Farm
     end
   end
 
-  def [](xref)
-    repos[xref]
-  end
-
   # add a new repo, with data from an input hash
   # if an :id is provided, then the new repo will be stored under that directory name,
   # otherwise a unique id will be generated
@@ -70,4 +66,14 @@ class Treet::Farm
     thash = Treet::Hash.new(hash)
     repos[uuid] = thash.to_repo("#{root}/#{uuid}", opts.merge(:repotype => repotype))
   end
+
+  def xrefs
+    Dir.chdir(root) do
+      Dir.glob("*").select {|f| File.directory?(f)}
+    end
+  end
+
+  def count
+    xrefs.count
+  end
 end

data/lib/treet/gitfarm.rb

@@ -18,6 +18,10 @@ class Treet::Gitfarm < Treet::Farm
     super(:author => author)
   end
 
+  def repo(id, opts = {})
+    super(id, opts.merge(:author => author))
+  end
+
   def add(hash, opts = {})
     repo = super(hash, opts.merge(:author => author))
     if opts[:tag]

data/lib/treet/repo.rb

@@ -4,7 +4,7 @@ class Treet::Repo
   attr_reader :root
 
   def initialize(path, opts = {})
-    raise "Missing or invalid source path #{path}" unless File.directory?(path)
+    raise Errno::ENOENT, "Missing or invalid source path #{path}" unless File.directory?(path)
 
     @root = path
   end
@@ -13,10 +13,6 @@ class Treet::Repo
     expand(root)
   end
 
-  def reset
-    # clear any cached data
-  end
-
   def compare(target)
     Treet::Hash.diff(to_hash, target.to_hash)
   end
@@ -45,7 +41,7 @@ class Treet::Repo
 
     Dir.chdir(root) do
       diffs.each do |diff|
-        flag, key, v1, v2 = diff
+        flag, key, v1, _ = diff
         # if key =~ /\[/
         #   keyname = key.match(/^(.*)\[\]$/).captures
         # elsif key =~ /\./

data/lib/treet/version.rb

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

data/spec/lib/repo_spec.rb

@@ -14,7 +14,6 @@ describe "Repo" do
     repo.to_hash.should == {
       'name' => {'full' => 'John Bigbooté'}
     }
-    repo.reset
     repo.to_hash.should == {
       'name' => {'full' => 'John Bigbooté'}
     }

data/spec/lib/test_farm.rb

@@ -32,7 +32,7 @@ describe "Repository Farm" do
   end
 
   it "planting should create a directory of UUID-labeled repos" do
-    farm = Treet::Farm.plant(:json => "#{File.dirname(__FILE__)}/../json/master.json", :root => Dir.mktmpdir)
+    farm = Treet::Farm.plant(:json => jsonfile('master'), :root => Dir.mktmpdir)
 
     Dir.glob("#{farm.root}/*").count.must_equal 3
     Dir.glob("#{farm.root}/*/emails/*").count.must_equal 5
@@ -47,9 +47,17 @@ describe "Repository Farm" do
   #   farm['two'].to_hash['xref'].must_equal {'test' => 'two'}
   # end
 
+  it "should allow direct fetch by id" do
+    farm = Treet::Farm.plant(:json => jsonfile('master'), :root => Dir.mktmpdir)
+    repoid = farm.xrefs.sample
+    farm.repo(repoid).wont_be_nil
+    farm.repo("BOGUS").must_be_nil
+  end
+
   it "should take additions" do
-    farm = Treet::Farm.plant(:json => "#{File.dirname(__FILE__)}/../json/master.json", :root => Dir.mktmpdir)
+    farm = Treet::Farm.plant(:json => jsonfile('master'), :root => Dir.mktmpdir)
     farm.repos.count.must_equal 3
+    farm.count.must_equal 3
 
     bob_hash = load_json("bob1")
     repo = farm.add(bob_hash)

data/spec/lib/test_gitfarm.rb

@@ -35,6 +35,11 @@ describe Treet::Gitfarm do
         repo.tags.must_be_empty
       end
     end
+
+    it "should retrieve by id" do
+      repoid = farm.repos.keys.sample
+      farm.repo(repoid).wont_be_nil
+    end
   end
 
   describe "new repo in empty farm" do

data/spec/lib/test_gitrepo.rb

@@ -185,7 +185,7 @@ describe Treet::Gitrepo do
 
   describe "a tagged & patched repo" do
     def self.makerepo
-      @cache ||= begin
+      @repo ||= begin
         r = make_gitrepo('two',
           :author => {:name => 'Bob', :email => 'bob@example.com'},
           :xrefkey => 'app1',
@@ -269,7 +269,7 @@ describe Treet::Gitrepo do
 
   describe "a multiply-patched gitrepo" do
     def self.makerepo
-      @cache ||= begin
+      @repo ||= begin
         r = make_gitrepo('two', :author => {:name => 'Bob', :email => 'bob@example.com'})
         r.tag('app1')
         r.tag('app2')

data/treet.gemspec

@@ -23,4 +23,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "guard-rspec"
   gem.add_development_dependency "guard-minitest"
   gem.add_development_dependency "ruby_gntp"
+  gem.add_development_dependency "rb-fsevent"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: treet
 version: !ruby/object:Gem::Version
-  version: 0.10.3
+  version: 0.11.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-12 00:00:00.000000000 Z
+date: 2013-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -123,6 +123,22 @@ dependencies:
     - - ! '>='
       - !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
 email:
 - jmay@pobox.com
@@ -190,7 +206,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2545579231990389105
+      hash: -2853716979805169129
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -199,7 +215,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2545579231990389105
+      hash: -2853716979805169129
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24