fixup project to modern standards

Author: cbeer

Gemfile

@@ -2,18 +2,4 @@ source "http://rubygems.org"
 # Add dependencies required to use your gem here.
 # Example:
 #   gem "activesupport", ">= 2.3.5"
-
-gem "namaste"
-gem "anvl"
-gem "lockit"
-gem "checkm"
-gem "i18n"
-
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
-group :development do
-  gem "shoulda", ">= 0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.1"
-  gem "rcov", ">= 0"
-end
+gemspec

Gemfile.lock

@@ -1,31 +1,39 @@
+PATH
+  remote: .
+  specs:
+    dflat (0.3.0)
+      anvl
+      checkm
+      lockit
+      namaste
+
 GEM
   remote: http://rubygems.org/
   specs:
-    anvl (0.1.0)
-    checkm (0.0.4)
-    git (1.2.5)
-    i18n (0.4.1)
-    jeweler (1.5.1)
-      bundler (~> 1.0.0)
-      git (>= 1.2.5)
-      rake
-    lockit (0.0.0)
-    namaste (0.0.0)
+    anvl (0.3.0)
+    checkm (0.1.1)
+    diff-lcs (1.1.3)
+    i18n (0.6.0)
+    lockit (0.1.2)
+    namaste (0.3.0)
       i18n
-    rake (0.8.7)
-    rcov (0.9.9)
-    shoulda (2.11.3)
+    rake (0.9.2.2)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.2)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.2)
+    yard (0.8.2.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  anvl
-  bundler (~> 1.0.0)
-  checkm
-  i18n
-  jeweler (~> 1.5.1)
-  lockit
-  namaste
-  rcov
-  shoulda
+  bundler
+  dflat!
+  rake
+  rspec
+  yard

Rakefile

@@ -7,46 +7,39 @@ rescue Bundler::BundlerError => e
   $stderr.puts "Run `bundle install` to install missing gems"
   exit e.status_code
 end
-require 'rake'
 
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "dflat"
-  gem.homepage = "http://github.com/cbeer/dflat"
-  gem.license = "MIT"
-  gem.summary = %Q{Ruby Dflat implementation}
-  gem.email = "[email protected]"
-  gem.authors = ["Chris Beer"]
-  # Include your dependencies below. Runtime dependencies are required when using your gem,
-  # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
-  #  gem.add_runtime_dependency 'jabber4r', '> 0.1'
-  #  gem.add_development_dependency 'rspec', '> 1.2.3'
-end
-Jeweler::RubygemsDotOrgTasks.new
+Bundler::GemHelper.install_tasks
 
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
+require 'rake'
+require 'rspec'
+require 'rspec/core/rake_task'
 
-require 'rcov/rcovtask'
-Rcov::RcovTask.new do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
+desc 'Default: run specs.'
+task :default => :spec
 
-task :default => :test
+RSpec::Core::RakeTask.new do |t|
+  if ENV['COVERAGE'] and RUBY_VERSION =~ /^1.8/
+    t.rcov = true
+    t.rcov_opts = ['--exclude', 'spec', '--exclude', 'gems']
+  end
+end
 
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+# Use yard to build docs
+begin
+  require 'yard'
+  require 'yard/rake/yardoc_task'
+  project_root = File.expand_path(File.dirname(__FILE__))
+  doc_destination = File.join(project_root, 'doc')
 
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "dflat #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+  YARD::Rake::YardocTask.new(:doc) do |yt|
+    yt.files   = Dir.glob(File.join(project_root, 'lib', '**', '*.rb')) + 
+                 [ File.join(project_root, 'README.md') ]
+    yt.options = ['--output-dir', doc_destination, '--readme', 'README.md']
+  end
+rescue LoadError
+  desc "Generate YARD Documentation"
+  task :doc do
+    abort "Please install the YARD gem to generate rdoc."
+  end
 end
+

dflat.gemspec

@@ -1,82 +1,31 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{dflat}
-  s.version = "0.0.4"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chris Beer"]
-  s.date = %q{2010-11-27}
+  s.date = %q{2011-06-12}
   s.email = %q{[email protected]}
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
   ]
-  s.files = [
-    ".document",
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE.txt",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "dflat.gemspec",
-    "lib/dflat.rb",
-    "lib/dflat/home.rb",
-    "lib/dflat/version.rb",
-    "lib/dnatural.rb",
-    "lib/redd.rb",
-    "test/helper.rb",
-    "test/test_dflat.rb"
-  ]
-  s.homepage = %q{http://github.com/cbeer/dflat}
-  s.licenses = ["MIT"]
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Ruby Dflat implementation}
-  s.test_files = [
-    "test/helper.rb",
-    "test/test_dflat.rb"
-  ]
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.add_dependency "anvl"
+  s.add_dependency "namaste"
+  s.add_dependency "checkm"
+  s.add_dependency "lockit"
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<namaste>, [">= 0"])
-      s.add_runtime_dependency(%q<anvl>, [">= 0"])
-      s.add_runtime_dependency(%q<lockit>, [">= 0"])
-      s.add_runtime_dependency(%q<checkm>, [">= 0"])
-      s.add_runtime_dependency(%q<i18n>, [">= 0"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.1"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
-    else
-      s.add_dependency(%q<namaste>, [">= 0"])
-      s.add_dependency(%q<anvl>, [">= 0"])
-      s.add_dependency(%q<lockit>, [">= 0"])
-      s.add_dependency(%q<checkm>, [">= 0"])
-      s.add_dependency(%q<i18n>, [">= 0"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
-      s.add_dependency(%q<rcov>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<namaste>, [">= 0"])
-    s.add_dependency(%q<anvl>, [">= 0"])
-    s.add_dependency(%q<lockit>, [">= 0"])
-    s.add_dependency(%q<checkm>, [">= 0"])
-    s.add_dependency(%q<i18n>, [">= 0"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
-    s.add_dependency(%q<rcov>, [">= 0"])
-  end
+  s.add_development_dependency "rake"
+  s.add_development_dependency "bundler"
+  s.add_development_dependency "rspec"
+  s.add_development_dependency 'yard'
 end
 

spec/dflat_spec.rb

@@ -0,0 +1,110 @@
+require 'spec_helper'
+require 'tempfile'
+
+describe "dflat" do
+  context "Dflat home" do
+    before(:each) do
+      t = Tempfile.new 'dflat'
+      d = File.dirname t.path
+
+      FileUtils.rm_rf File.join(d, 'test')
+      @dflat = Dflat::Home.mkdir File.join(d, 'test')
+    end
+
+    it "should contain core files" do
+      files = []
+      Dir.chdir(@dflat.path) do
+        files = Dir.glob(File.join('**', '*'))
+      end
+
+      files.should include('0=dflat_0.19', 'current.txt', 'dflat-info.txt', 'v001', 'v001/full/0=dnatural_0.17')
+    end
+
+    it "should point to versioned content" do
+      File.basename(@dflat.current.path).should == 'v001'
+      File.read(File.join(@dflat.path, 'current.txt')).should == 'v001'
+    end
+
+
+    it "should have dflat info" do
+      info = @dflat.info
+      info[:objectScheme].should == 'Dflat/0.19'
+    end
+
+    it "should update dflat info" do
+      info = @dflat.info
+      info[:test] = 'abcdef'
+      @dflat.info = info
+      info = @dflat.info
+      info[:test].should == 'abcdef'
+    end
+
+    it "should add file to current version" do
+      file = @dflat.current.add 'LICENSE.txt', 'producer/abcdef'
+      lines = @dflat.current.manifest!.to_s.split "\n"
+      lines[0].should == '#%checkm_0.7'
+      lines[1].should =~ /provider\/abcdef/
+      @dflat.current.manifest.should be_valid
+    end
+
+    it "should remove file from current version" do
+      file = @dflat.current.add 'LICENSE.txt', 'producer/abcdef'
+      @dflat.current.remove 'producer/abcdef'
+      lines = @dflat.current.manifest!.to_s.split "\n"
+      lines.should have(1).line
+      lines[0].should == '#%checkm_0.7'
+    end
+
+    it "should do basic dnatural versioning" do
+      version = @dflat.checkout
+
+                  
+      @dflat.commit
+
+      File.basename(@dflat.current.path).should == 'v002'
+      File.read(File.join(@dflat.path, 'current.txt')).should == 'v002'
+    end
+
+    it "should handle ReDD versioning" do
+
+      previous = @dflat.current
+      version = @dflat.checkout
+      @dflat.commit!
+      
+      File.exists?(File.join(previous.path, 'delta')).should == true
+    end
+
+    it "should handle ReDD adds" do
+
+      previous = @dflat.current
+      version = @dflat.checkout
+      version.add 'LICENSE.txt', 'producer/abcdef'
+      @dflat.commit!
+      
+      File.exists?(File.join(previous.path, 'delta')).should == true
+      File.read(File.join(previous.path, 'delta', 'delete.txt')).should == 'producer/abcdef'
+    end
+
+    it "should handle ReDD removes" do
+      previous = @dflat.current
+      previous.add 'LICENSE.txt', 'producer/abcdef'
+      version = @dflat.checkout
+      version.remove 'producer/abcdef'
+      @dflat.commit!
+      
+      File.exists?(File.join(previous.path, 'delta', 'add', 'producer', 'abcdef')).should == true
+    end
+
+    it "should handle ReDD modifies" do
+      previous = @dflat.current
+      previous.add 'LICENSE.txt', 'producer/abcdef'
+      version = @dflat.checkout
+      version.add 'README.rdoc', 'producer/abcdef'
+      @dflat.commit!
+      
+      File.exists?(File.join(previous.path, 'delta', 'add', 'producer', 'abcdef')).should == true
+      File.read(File.join(previous.path, 'delta', 'delete.txt')).should == 'producer/abcdef'
+    end
+
+  end
+end

spec/spec_helper.rb

@@ -0,0 +1,14 @@
+require 'rubygems'
+require 'bundler/setup'
+
+if ENV['COVERAGE'] and RUBY_VERSION =~ /^1.9/
+  require 'simplecov'
+  SimpleCov.start
+end
+
+require 'rspec'
+require 'dflat'
+
+RSpec.configure do |config|
+
+end