From b96ef9d521252f8f5a324d4e82f6b7efadaade7a Mon Sep 17 00:00:00 2001 From: Michael Slone Date: Wed, 18 Sep 2013 08:53:13 -0400 Subject: [PATCH 1/7] use HTTPS for rubygems --- Gemfile | 2 +- Gemfile.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index db574cb..e217394 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,4 @@ -source "http://rubygems.org" +source "https://rubygems.org" # Add dependencies required to use your gem here. # Example: # gem "activesupport", ">= 2.3.5" diff --git a/Gemfile.lock b/Gemfile.lock index 04c3515..3930a72 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,7 +8,7 @@ PATH namaste GEM - remote: http://rubygems.org/ + remote: https://rubygems.org/ specs: anvl (0.3.0) checkm (0.1.1) From bb8338de8257aa7b6e943f0e1d60747a7516b22c Mon Sep 17 00:00:00 2001 From: Michael Slone Date: Wed, 18 Sep 2013 08:53:51 -0400 Subject: [PATCH 2/7] add summary to gemspec --- dflat.gemspec | 1 + 1 file changed, 1 insertion(+) diff --git a/dflat.gemspec b/dflat.gemspec index 72f4101..656617a 100644 --- a/dflat.gemspec +++ b/dflat.gemspec @@ -6,6 +6,7 @@ Gem::Specification.new do |s| s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Chris Beer"] + s.summary = %q{Ruby Dflat implementation} s.date = %q{2011-06-12} s.email = %q{chris@cbeer.info} s.extra_rdoc_files = [ From c4e5dd4a707613cb48ef1981171f8772918301d6 Mon Sep 17 00:00:00 2001 From: Michael Slone Date: Wed, 18 Sep 2013 09:07:21 -0400 Subject: [PATCH 3/7] add autotest helpers --- .rspec | 0 Gemfile.lock | 4 ++++ dflat.gemspec | 2 ++ 3 files changed, 6 insertions(+) create mode 100644 .rspec diff --git a/.rspec b/.rspec new file mode 100644 index 0000000..e69de29 diff --git a/Gemfile.lock b/Gemfile.lock index 3930a72..a6f8111 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -10,6 +10,7 @@ PATH GEM remote: https://rubygems.org/ specs: + ZenTest (4.9.3) anvl (0.3.0) checkm (0.1.1) diff-lcs (1.1.3) @@ -18,6 +19,7 @@ GEM namaste (0.3.0) i18n rake (0.9.2.2) + redgreen (1.2.2) rspec (2.11.0) rspec-core (~> 2.11.0) rspec-expectations (~> 2.11.0) @@ -32,8 +34,10 @@ PLATFORMS ruby DEPENDENCIES + ZenTest bundler dflat! rake + redgreen rspec yard diff --git a/dflat.gemspec b/dflat.gemspec index 656617a..5dd32bc 100644 --- a/dflat.gemspec +++ b/dflat.gemspec @@ -26,7 +26,9 @@ Gem::Specification.new do |s| s.add_development_dependency "rake" s.add_development_dependency "bundler" + s.add_development_dependency "redgreen" s.add_development_dependency "rspec" s.add_development_dependency 'yard' + s.add_development_dependency "ZenTest" end From d8233103a873ad69894672edfe46f5e6b857dee8 Mon Sep 17 00:00:00 2001 From: Michael Slone Date: Thu, 19 Sep 2013 09:06:49 -0400 Subject: [PATCH 4/7] make tests pass --- lib/dflat/version.rb | 20 ++++++++++---------- spec/dflat_spec.rb | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/dflat/version.rb b/lib/dflat/version.rb index aaf0976..2d2a537 100644 --- a/lib/dflat/version.rb +++ b/lib/dflat/version.rb @@ -62,9 +62,9 @@ def add src, dest, options = {} manifest! lock - m = manifest.add dest, :base => data_path - File.open(File.join(path, 'manifest.txt'), 'w') do |f| - f.write(m.to_s) + manifest.add dest, :base => data_path + File.open(manifest_path, 'w') do |f| + f.write(manifest.to_s) end unlock @@ -75,14 +75,14 @@ def remove list, options = {} list = [list] if list.instance_of? String FileUtils.rm list.map { |x| File.join(data_path, x) }, options - m = manifest! + manifest! lock list.each do |l| - m = m.remove l + manifest.remove l end - File.open(File.join(path, 'manifest.txt'), 'w') do |f| - f.write(m.to_s) + File.open(manifest_path, 'w') do |f| + f.write(manifest.to_s) end unlock end @@ -142,9 +142,9 @@ def initialize path def add source, dest, options = {} manifest! f = @redd.add source, dest, options - m = manifest.add dest, :base => File.join(data_path, 'add') - File.open(File.join(path, 'manifest.txt'), 'w') do |f| - f.write(m.to_s) + manifest.add dest, :options => {:path => File.join(data_path, 'add')} + File.open(manifest_path, 'w') do |f| + f.write(manifest.to_s) end f diff --git a/spec/dflat_spec.rb b/spec/dflat_spec.rb index 8f7500b..1e40779 100644 --- a/spec/dflat_spec.rb +++ b/spec/dflat_spec.rb @@ -43,7 +43,7 @@ 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/ + lines[1].should =~ /producer\/abcdef/ @dflat.current.manifest.should be_valid end From 8aa70bf3fba2d9842f03940d21f706b17817905d Mon Sep 17 00:00:00 2001 From: Michael Slone Date: Thu, 19 Sep 2013 09:58:14 -0400 Subject: [PATCH 5/7] use manifest_path instead of File.join(...) in more places --- lib/dflat/version.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/dflat/version.rb b/lib/dflat/version.rb index 2d2a537..221e6b1 100644 --- a/lib/dflat/version.rb +++ b/lib/dflat/version.rb @@ -62,7 +62,7 @@ def add src, dest, options = {} manifest! lock - manifest.add dest, :base => data_path + manifest.add dest, :options => {:path => data_path} File.open(manifest_path, 'w') do |f| f.write(manifest.to_s) end @@ -153,13 +153,13 @@ def add source, dest, options = {} def remove list, options = {} list = [list] if list.instance_of? String @redd.remove list.map { |x| x }, options - m = manifest! + manifest! list.each do |l| - m = m.remove l + manifest.remove l end - File.open(File.join(path, 'manifest.txt'), 'w') do |f| - f.write(m.to_s) + File.open(manifest_path, 'w') do |f| + f.write(manifest.to_s) end end From fec7d3cc6794f932b27f40fa1fb4d1e816b85d92 Mon Sep 17 00:00:00 2001 From: Michael Slone Date: Thu, 19 Sep 2013 13:44:38 -0400 Subject: [PATCH 6/7] don't track Gemfile.lock in gem --- .gitignore | 3 +++ Gemfile.lock | 8 +++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 2288186..2960859 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,9 @@ doc # jeweler generated pkg +# don't track Gemfile.lock in gem +*.lock + # Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore: # # * Create a file at ~/.gitignore diff --git a/Gemfile.lock b/Gemfile.lock index a6f8111..e4ef91c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,9 @@ +GIT + remote: git://github.com/uklibraries/anvl.git + revision: 285651d100482cb6204a7c3857057d2bf40c278d + specs: + anvl (0.3.0) + PATH remote: . specs: @@ -11,7 +17,6 @@ GEM remote: https://rubygems.org/ specs: ZenTest (4.9.3) - anvl (0.3.0) checkm (0.1.1) diff-lcs (1.1.3) i18n (0.6.0) @@ -35,6 +40,7 @@ PLATFORMS DEPENDENCIES ZenTest + anvl! bundler dflat! rake From 56a1aa57a00d30b2cdf202c4962f4c2a10626578 Mon Sep 17 00:00:00 2001 From: Michael Slone Date: Thu, 19 Sep 2013 13:45:04 -0400 Subject: [PATCH 7/7] use working copy of anvl --- Gemfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Gemfile b/Gemfile index e217394..d4f6e25 100644 --- a/Gemfile +++ b/Gemfile @@ -3,3 +3,5 @@ source "https://rubygems.org" # Example: # gem "activesupport", ">= 2.3.5" gemspec + +gem "anvl", :git => "git://github.com/uklibraries/anvl.git"