dandelion 0.4.9 → 0.4.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8b48742a49e8ef3d40974070b049932ee2dc8c5
-  data.tar.gz: 8a974424baa966a9629eaf84930d8343d032717a
+  metadata.gz: d80fc2861138ce9058efaf8ab53e71b854314b4b
+  data.tar.gz: a32ec46d1ad6f00daf7f078b3002e4f28513ae46
 SHA512:
-  metadata.gz: ba4f6eed19ba61a5dc56a9f3faa07b75ac9c5371870efbfb89199184eda4be17535e047aeb0c8d6c4a191cd41ab3673d6cf7ce08a6f4e85d9a7b1b13535f728e
-  data.tar.gz: b801aa985142bfd07214bad9db56835f6590c0ac91d814fa1811cd927e5acec5bb22a45428d0769e1a32b8b500c7c88ae307a00af1fbe6018eddb862f7e3d873
+  metadata.gz: 6282aff815d0c4017adb1c8e17c1b1f292b501e8a333efdff233e353c3725cb2277d9a0b64039e92688b205e9f03e480b943ae1362c92e6750b8c6a3b4b260c7
+  data.tar.gz: a323d6165bfedb74f9f3f46be3decc42df8518b847c2af322bff2ae383fcfc61fea89279dfa3806f1feba41f18ff3fa6463351f54b76e3f9b44d7d0a61b7f5fa

data/lib/dandelion/changeset.rb

@@ -1,7 +1,7 @@
 module Dandelion
   class Changeset
     include Enumerable
-    
+
     def initialize(tree, commit, options = {})
       @tree = tree
       @commit = commit
@@ -33,18 +33,22 @@ module Dandelion
 
   private
 
+    def expand_path(path)
+      File.expand_path(path).to_s
+    end
+
     def local_path
-      @options[:local_path] || ''
+      expand_path(@options[:local_path] || '')
     end
 
     def applicable?(path)
-      path.start_with?(local_path)
+      expand_path(path).start_with?(expand_path(local_path))
     end
 
     def transform_path(path)
-      trimmed = path[local_path.length..-1]
+      trimmed = expand_path(path)[expand_path(local_path).length..-1]
       trimmed = trimmed[1..-1] if trimmed[0] == File::SEPARATOR
       trimmed
     end
   end
-end
+end

data/lib/dandelion/cli.rb

@@ -46,19 +46,19 @@ module Dandelion
     end
 
     def execute!
-      parse!(@parser)
-
       if @args.length == 0
         @options[:help] = true
       end
+      
+      parse!(@parser)
 
-      if @options[:help]
-        display_help
+      if @options[:version]
+        log.info("Dandelion #{Dandelion::VERSION}")
         exit
       end
 
-      if @options[:version]
-        log.info("Dandelion #{Dandelion::VERSION}")
+      if @options[:help]
+        display_help
         exit
       end
 

data/lib/dandelion/version.rb

@@ -1,3 +1,3 @@
 module Dandelion
-  VERSION = '0.4.9'
+  VERSION = '0.4.10'
 end

data/spec/dandelion/changeset_spec.rb

@@ -27,7 +27,7 @@ describe Dandelion::Changeset do
   end
 
   context 'non-empty local path' do
-    let(:changeset) { test_changeset(local_path: 'baz') }
+    let(:changeset) { test_changeset(local_path: './baz') }
 
     describe '#enumerable' do
       let(:changes) { changeset.to_a }
@@ -53,7 +53,7 @@ describe Dandelion::Changeset do
 
   context 'empty diff' do
     let(:changeset) { test_changeset }
-    before(:each) { changeset.stub(:diff).and_return([]) }
+    before(:each) { allow(changeset).to receive(:diff) { [] } }
 
     describe '#enumerable' do
       let(:changes) { changeset.to_a }
@@ -70,4 +70,4 @@ describe Dandelion::Changeset do
       end
     end
   end
-end
+end

data/spec/dandelion/command/deploy_spec.rb

@@ -22,7 +22,7 @@ describe Dandelion::Command::Deploy do
   describe '#deployer_adapter' do
     it 'returns workspace adapter' do
       adapter = double('adapter')
-      workspace.should_receive(:adapter).and_return(adapter)
+      expect(workspace).to receive(:adapter).and_return(adapter)
       expect(command.deployer_adapter).to eq adapter
     end
 
@@ -31,18 +31,18 @@ describe Dandelion::Command::Deploy do
 
       it 'uses no-op adapter' do
         noop = double('no-op adapter')
-        Dandelion::Adapter::NoOpAdapter.should_receive(:new).with(command.config).and_return(noop)
+        expect(Dandelion::Adapter::NoOpAdapter).to receive(:new).with(command.config).and_return(noop)
         expect(command.deployer_adapter).to eq noop
       end
     end
   end
 
   describe '#deployer' do
-    before(:each) { command.stub(:adapter).and_return(double('adapter')) }
+    before(:each) { allow(command).to receive(:adapter).and_return(double('adapter')) }
 
     it 'creates deployer for adapter, and config' do
       deployer = double('deployer')
-      Dandelion::Deployer.should_receive(:new).with(command.deployer_adapter, command.config).and_return(deployer)
+      expect(Dandelion::Deployer).to receive(:new).with(command.deployer_adapter, command.config).and_return(deployer)
       expect(command.deployer).to eq deployer
     end
   end
@@ -63,49 +63,49 @@ describe Dandelion::Command::Deploy do
     let(:changeset) { double('changeset') }
 
     before(:each) do
-      workspace.stub(:changeset).and_return(changeset)
-      command.stub(:deployer).and_return(deployer)
+      allow(workspace).to receive(:changeset) { changeset }
+      allow(command).to receive(:deployer) { deployer }
     end
 
     context 'empty changeset' do
-      before(:each) { changeset.stub(:empty?).and_return(true) }
+      before(:each) { allow(changeset).to receive(:empty?) { true } }
 
       it 'does nothing' do
-        deployer.should_not_receive(:deploy!)
+        expect(deployer).to_not receive(:deploy!)
       end
     end
 
     context 'non-empty changeset' do
       before(:each) do
-        deployer.stub(:deploy_changeset!)
-        changeset.stub(:empty?).and_return(false)
+        allow(deployer).to receive(:deploy_changeset!)
+        allow(changeset).to receive(:empty?) { false }
       end
 
       it 'deploys changeset' do
-        deployer.should_receive(:deploy_changeset!).with(changeset)
+        expect(deployer).to receive(:deploy_changeset!).with(changeset)
         command.execute!
       end
 
       it 'sets remote revision to local revision' do
-        workspace.should_receive(:remote_commit=).with(workspace.local_commit)
+        expect(workspace).to receive(:remote_commit=).with(workspace.local_commit)
         command.execute!
       end
     end
 
     context 'non-empty additional files' do
       before(:each) do
-        changeset.stub(:empty?).and_return(true)
+        allow(changeset).to receive(:empty?) { true }
       end
 
       before(:each) do
-        deployer.stub(:deploy_files!)
+        allow(deployer).to receive(:deploy_files!)
         config[:additional] = ['foo']
       end
 
       it 'deploys files' do
-        deployer.should_receive(:deploy_files!).with(['foo'])
+        expect(deployer).to receive(:deploy_files!).with(['foo'])
         command.execute!
       end
     end
   end
-end
+end

data/spec/dandelion/command/init_spec.rb

@@ -11,7 +11,7 @@ describe Dandelion::Command::Init do
     before { command.setup([revision]) }
 
     it 'sets remote revision to specified revision' do
-      workspace.should_receive(:remote_commit=).with(workspace.lookup(revision))
+      expect(workspace).to receive(:remote_commit=).with(workspace.lookup(revision))
       command.execute!
     end
   end

data/spec/dandelion/config_spec.rb

@@ -10,7 +10,7 @@ describe Dandelion::Config do
 
   before(:each) do
     ENV['BAZ'] = 'qux'
-    IO.should_receive(:read).with('foo').and_return(yaml)
+    expect(IO).to receive(:read).with('foo').and_return(yaml)
   end
 
   let(:config) { Dandelion::Config.new(path: 'foo') }
@@ -22,4 +22,4 @@ describe Dandelion::Config do
   it 'parses ERB' do
     expect(config[:baz]).to eq 'qux'
   end
-end
+end

data/spec/dandelion/deployer_spec.rb

@@ -12,9 +12,9 @@ describe Dandelion::Deployer do
     ]}
 
     it 'perfoms writes and deletions on adapter' do
-      adapter.should_receive(:write).with('foo', 'bar')
-      adapter.should_receive(:write).with('bar/baz', 'baz')
-      adapter.should_receive(:delete).with('qux')
+      expect(adapter).to receive(:write).with('foo', 'bar')
+      expect(adapter).to receive(:write).with('bar/baz', 'baz')
+      expect(adapter).to receive(:delete).with('qux')
 
       deployer.deploy_changeset!(changeset)
     end
@@ -23,8 +23,8 @@ describe Dandelion::Deployer do
       let(:deployer) { Dandelion::Deployer.new(adapter, exclude: ['foo']) }
 
       it 'perfoms writes and deletions on adapter' do
-        adapter.should_receive(:write).with('bar/baz', 'baz')
-        adapter.should_receive(:delete).with('qux')
+        expect(adapter).to receive(:write).with('bar/baz', 'baz')
+        expect(adapter).to receive(:delete).with('qux')
 
         deployer.deploy_changeset!(changeset)
       end
@@ -33,18 +33,18 @@ describe Dandelion::Deployer do
 
   describe '#deploy_files!' do
     before(:each) do
-      IO.stub(:binread).with('a.txt').and_return('A')
-      IO.stub(:binread).with('b.txt').and_return('B')
-      IO.stub(:binread).with('c/a.txt').and_return('cA')
-      IO.stub(:binread).with('c/b.txt').and_return('cB')
+      allow(IO).to receive(:binread).with('a.txt').and_return('A')
+      allow(IO).to receive(:binread).with('b.txt').and_return('B')
+      allow(IO).to receive(:binread).with('c/a.txt').and_return('cA')
+      allow(IO).to receive(:binread).with('c/b.txt').and_return('cB')
     end
 
     context 'local paths' do
       let(:files) { ['a.txt', 'b.txt'] }
 
       it 'performs writes on adapter' do
-        adapter.should_receive(:write).with('a.txt', 'A')
-        adapter.should_receive(:write).with('b.txt', 'B')
+        expect(adapter).to receive(:write).with('a.txt', 'A')
+        expect(adapter).to receive(:write).with('b.txt', 'B')
 
         deployer.deploy_files!(files)
       end
@@ -57,8 +57,8 @@ describe Dandelion::Deployer do
       ]}
 
       it 'performs writes on adapter' do
-        adapter.should_receive(:write).with('files/a.txt', 'A')
-        adapter.should_receive(:write).with('files/b.txt', 'B')
+        expect(adapter).to receive(:write).with('files/a.txt', 'A')
+        expect(adapter).to receive(:write).with('files/b.txt', 'B')
 
         deployer.deploy_files!(files)
       end
@@ -70,18 +70,18 @@ describe Dandelion::Deployer do
       ]}
 
       before(:each) do
-        File.stub(:directory?).with('c/').and_return(true)
-        File.stub(:directory?).with('c/a.txt').and_return(false)
-        File.stub(:directory?).with('c/b.txt').and_return(false)
-        Dir.stub(:glob).with('c/**/*').and_return(['c/a.txt', 'c/b.txt'])
+        allow(File).to receive(:directory?).with('c/').and_return(true)
+        allow(File).to receive(:directory?).with('c/a.txt').and_return(false)
+        allow(File).to receive(:directory?).with('c/b.txt').and_return(false)
+        allow(Dir).to receive(:glob).with('c/**/*').and_return(['c/a.txt', 'c/b.txt'])
       end
 
       it 'performs writes on adapter' do
-        adapter.should_receive(:write).with('C/a.txt', 'cA')
-        adapter.should_receive(:write).with('C/b.txt', 'cB')
+        expect(adapter).to receive(:write).with('C/a.txt', 'cA')
+        expect(adapter).to receive(:write).with('C/b.txt', 'cB')
 
         deployer.deploy_files!(files)
       end
     end
   end
-end
+end

data/spec/dandelion/workspace_spec.rb

@@ -55,7 +55,7 @@ describe Dandelion::Workspace do
 
   describe '#remote_commit' do
     before(:each) do
-      adapter.stub(:read).with('.revision').and_return(initial_revision)
+      allow(adapter).to receive(:read).with('.revision').and_return(initial_revision)
     end
 
     it 'returns commit for revision read from adapter' do
@@ -65,7 +65,7 @@ describe Dandelion::Workspace do
 
   describe '#remote_commit=' do
     it 'writes commit revision to adapter' do
-      adapter.should_receive(:write).with('.revision', head_revision)
+      allow(adapter).to receive(:write).with('.revision', head_revision)
       workspace.remote_commit = workspace.local_commit
     end
   end
@@ -73,7 +73,7 @@ describe Dandelion::Workspace do
   describe '#tree' do
     it 'returns tree for repo and local commit' do
       tree = double()
-      Dandelion::Tree.should_receive(:new).with(test_repo, workspace.local_commit).and_return(tree)
+      expect(Dandelion::Tree).to receive(:new).with(test_repo, workspace.local_commit).and_return(tree)
       expect(workspace.tree).to eq tree
     end
   end
@@ -84,12 +84,12 @@ describe Dandelion::Workspace do
       tree = double('tree')
       remote_commit = double('remote_commit')
 
-      workspace.stub(:tree).and_return(tree)
-      workspace.stub(:remote_commit).and_return(remote_commit)
+      allow(workspace).to receive(:tree).and_return(tree)
+      allow(workspace).to receive(:remote_commit).and_return(remote_commit)
 
-      Dandelion::Changeset.should_receive(:new).with(tree, remote_commit, workspace.config).and_return(changeset)
+      allow(Dandelion::Changeset).to receive(:new).with(tree, remote_commit, workspace.config).and_return(changeset)
 
       expect(workspace.changeset).to eq changeset
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dandelion
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.4.10
 platform: ruby
 authors:
 - Scott Nelson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-19 00:00:00.000000000 Z
+date: 2015-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged