dandelion 0.3.15 → 0.4.0.beta2

data/spec/dandelion/command/deploy_spec.rb

@@ -0,0 +1,111 @@
+require 'spec_helper'
+
+describe Dandelion::Command::Deploy do
+  let(:config) {{}}
+  let(:options) {{}}
+
+  let(:adapter) { double('adapter') }
+  let(:workspace) { Dandelion::Workspace.new(test_repo, adapter) }
+  let(:command) { Dandelion::Command::Deploy.new(workspace, config, options) }
+
+  describe '#parser' do
+    let(:options) { {} }
+    let(:parser) { Dandelion::Command::Deploy.parser(options) }
+
+    it 'parses dry flag' do
+      expect(options[:dry]).to eq nil
+      parser.order!(['--dry-run'])
+      expect(options[:dry]).to eq true
+    end
+  end
+
+  describe '#deployer_adapter' do
+    it 'returns workspace adapter' do
+      adapter = double('adapter')
+      workspace.should_receive(:adapter).and_return(adapter)
+      expect(command.deployer_adapter).to eq adapter
+    end
+
+    context 'dry run' do
+      before(:each) { options[:dry] = true }
+
+      it 'uses no-op adapter' do
+        noop = double('no-op adapter')
+        Dandelion::Adapter::NoOpAdapter.should_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')) }
+
+    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(command.deployer).to eq deployer
+    end
+  end
+
+  describe '#setup' do
+    it 'sets revision' do
+      command.setup([:foo])
+      expect(command.config[:revision]).to eq :foo
+    end
+  end
+
+  describe '#execute!' do
+    let(:adapter) { Dandelion::Adapter::NoOpAdapter.new(config) }
+    let(:workspace) { Dandelion::Workspace.new(test_repo, adapter) }
+    let(:command) { Dandelion::Command::Deploy.new(workspace, config, options) }
+
+    let(:deployer) { double('deployer') }
+    let(:changeset) { double('changeset') }
+
+    before(:each) do
+      workspace.stub(:changeset).and_return(changeset)
+      command.stub(:deployer).and_return(deployer)
+    end
+
+    context 'empty changeset' do
+      before(:each) { changeset.stub(:empty?).and_return(true) }
+
+      it 'does nothing' do
+        deployer.should_not_receive(:deploy!)
+      end
+    end
+
+    context 'non-empty changeset' do
+      before(:each) do
+        deployer.stub(:deploy_changeset!)
+        changeset.stub(:empty?).and_return(false)
+      end
+
+      it 'deploys changeset' do
+        deployer.should_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)
+        command.execute!
+      end
+    end
+
+    context 'non-empty additional files' do
+      before(:each) do
+        changeset.stub(:empty?).and_return(true)
+      end
+
+      before(:each) do
+        deployer.stub(:deploy_files!)
+        config[:additional] = ['foo']
+      end
+
+      it 'deploys files' do
+        deployer.should_receive(:deploy_files!).with(['foo'])
+        command.execute!
+      end
+    end
+  end
+end

data/spec/dandelion/command/status_spec.rb

@@ -0,0 +1,4 @@
+require 'spec_helper'
+
+describe Dandelion::Command::Status do
+end

data/spec/dandelion/command_spec.rb

@@ -0,0 +1,70 @@
+require 'spec_helper'
+
+describe Dandelion::Command::Base do
+  let(:workspace) { double('workspace', adapter: double('adapter')) }
+  let(:config) { double('config') }
+  let(:options) { double('options') }
+
+  let(:command) { Dandelion::Command::Base.new(workspace, config, options) }
+
+  it 'registers command classes' do
+    class TestCommand < Dandelion::Command::Base
+      command :test
+    end
+
+    expect(Dandelion::Command::Base.lookup(:test)).to eq TestCommand
+  end
+
+  it 'raises error on invalid command' do
+    expect {
+      Dandelion::Command::Base.lookup(:another)
+    }.to raise_error(Dandelion::Command::InvalidCommandError)
+  end
+
+  it 'has workspace' do
+    expect(command.workspace).to eq workspace
+  end
+
+  it 'has config' do
+    expect(command.config).to eq config
+  end
+
+  it 'has options' do
+    expect(command.options).to eq options
+  end
+
+  describe '#adapter' do
+    it 'returns workspace adapter' do
+      expect(command.adapter).to eq workspace.adapter
+    end
+  end
+
+  describe '#parser' do
+    let(:options) { {} }
+    let(:parser) { Dandelion::Command::Base.parser(options) }
+
+    it 'parses version flag' do
+      expect(options[:version]).to_not be
+      parser.order!(['-v'])
+      expect(options[:version]).to be
+    end
+
+    it 'parses help flag' do
+      expect(options[:help]).to_not be
+      parser.order!(['-h'])
+      expect(options[:help]).to be
+    end
+
+    it 'parses repo option' do
+      expect(options[:repo]).to eq nil
+      parser.order!(['--repo=foo'])
+      expect(options[:repo]).to eq 'foo'
+    end
+
+    it 'parses config option' do
+      expect(options[:config]).to eq nil
+      parser.order!(['--config=foo'])
+      expect(options[:config]).to eq 'foo'
+    end
+  end
+end

data/spec/dandelion/config_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe Dandelion::Config do
+  let(:data) {{ 'foo' => 'bar' }}
+
+  before(:each) do
+    YAML.should_receive(:load_file).with('foo').and_return(data)
+  end
+
+  let(:config) { Dandelion::Config.new(path: 'foo') }
+
+  it 'parses yaml config file' do
+    expect(config[:foo]).to eq 'bar'
+  end
+end

data/spec/dandelion/deployer_spec.rb

@@ -0,0 +1,65 @@
+require 'spec_helper'
+
+describe Dandelion::Deployer do
+  let(:adapter) { double('adapter') }
+  let(:deployer) { Dandelion::Deployer.new(adapter) }
+
+  describe '#deploy_changeset!' do
+    let(:changeset) {[
+      double(path: 'foo', data: 'bar', type: :write),
+      double(path: 'bar/baz', data: 'baz', type: :write),
+      double(path: 'qux', type: :delete)
+    ]}
+
+    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')
+
+      deployer.deploy_changeset!(changeset)
+    end
+
+    context 'excluded' 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')
+
+        deployer.deploy_changeset!(changeset)
+      end
+    end
+  end
+
+  describe '#deploy_files!' do
+    before(:each) do
+      IO.stub(:read).with('a.txt').and_return('A')
+      IO.stub(:read).with('b.txt').and_return('B')
+    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')
+
+        deployer.deploy_files!(files)
+      end
+    end
+
+    context 'local and remote paths' do
+      let(:files) {[
+        { 'a.txt' => 'files/a.txt' },
+        { 'b.txt' => 'files/b.txt' }
+      ]}
+
+      it 'performs writes on adapter' do
+        adapter.should_receive(:write).with('files/a.txt', 'A')
+        adapter.should_receive(:write).with('files/b.txt', 'B')
+
+        deployer.deploy_files!(files)
+      end
+    end
+  end
+end

data/spec/dandelion/diff_spec.rb

@@ -0,0 +1,54 @@
+require 'spec_helper'
+
+describe Dandelion::Diff do
+  let(:from_commit) { test_repo.lookup('e289ff1e2729839759dbd6fe99b6e35880910c7c') }
+  let(:to_commit) { test_repo.lookup('3d9b743acb4a84dd99002d2c6f3fcf1a47e9f06b') }
+
+  context 'non-nil from commit' do
+    let(:diff) { test_diff }
+
+    describe '#empty?' do
+      it 'returns true if there are no changes' do
+        expect(diff.empty?).to_not be
+      end
+    end
+
+    describe '#enumerable' do
+      it 'returns all changes between commits' do
+        expect(diff.to_a.length).to eq 5
+      end
+
+      it 'returns write paths' do
+        changes = diff.select { |c| c.type == :write }.map(&:path)
+
+        expect(changes).to include 'foo'
+        expect(changes).to include 'qux'
+        expect(changes).to include 'baz/bar'
+        expect(changes.length).to eq 3
+      end
+
+      it 'returns delete paths' do
+        changes = diff.select { |c| c.type == :delete }.map(&:path)
+
+        expect(changes).to include 'bar'
+        expect(changes).to include 'baz/foo'
+        expect(changes.length).to eq 2
+      end
+    end
+  end
+
+  context 'nil from commit' do
+    let(:diff) { Dandelion::Diff.new(nil, to_commit) }
+
+    describe '#enumerable' do
+      it 'returns all paths in to commit' do
+        changes = diff.map(&:path)
+
+        expect(changes).to include 'foo'
+        expect(changes).to include 'qux'
+        expect(changes).to include 'baz/bar'
+        expect(changes.length).to eq 3
+      end
+    end
+  end
+end

data/spec/dandelion/tree_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe Dandelion::Tree do
+  let(:tree) { test_tree }
+
+  it 'has a commit' do
+    expect(tree.commit).to eq test_commits.last
+  end
+
+  describe '#data' do
+    it 'returns blob content for path' do
+      expect(tree.data('foo')).to eq "foo\n"
+    end
+  end
+end

data/spec/dandelion/workspace_spec.rb

@@ -0,0 +1,77 @@
+require 'spec_helper'
+
+describe Dandelion::Workspace do
+  let(:adapter) { double('adapter') }
+  let(:workspace) { Dandelion::Workspace.new(test_repo, adapter) }
+
+  let(:head_revision) { '3d9b743acb4a84dd99002d2c6f3fcf1a47e9f06b' }
+  let(:initial_revision) { 'e289ff1e2729839759dbd6fe99b6e35880910c7c' }
+
+  it 'has an adapter' do
+    expect(workspace.adapter).to eq adapter
+  end
+
+  describe '#local_commit' do
+    context 'no revision specified' do
+      it 'returns head commit' do
+        expect(workspace.local_commit.oid).to eq head_revision
+      end
+    end
+
+    context 'valid revision specified' do
+      let(:workspace) { Dandelion::Workspace.new(test_repo, adapter, revision: initial_revision) }
+
+      it 'returns commit for given revision' do
+        expect(workspace.local_commit.oid).to eq initial_revision
+      end
+    end
+
+    context 'invalid revision specified' do
+      let(:workspace) { Dandelion::Workspace.new(test_repo, adapter, revision: 'abcdef' ) }
+
+      it 'raises revision error' do
+        expect { workspace.local_commit }.to raise_error(Dandelion::RevisionError)
+      end
+    end
+  end
+
+  describe '#remote_commit' do
+    before(:each) do
+      adapter.stub(:read).with('.revision').and_return(initial_revision)
+    end
+
+    it 'returns commit for revision read from adapter' do
+      expect(workspace.remote_commit.oid).to eq initial_revision
+    end
+  end
+
+  describe '#remote_commit=' do
+    it 'writes commit revision to adapter' do
+      adapter.should_receive(:write).with('.revision', head_revision)
+      workspace.remote_commit = workspace.local_commit
+    end
+  end
+
+  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(workspace.tree).to eq tree
+    end
+  end
+
+  describe '#changeset' do
+    it 'returns changeset for tree and remote commit' do
+      changeset = double('changeset')
+      tree = double('tree')
+      remote_commit = double('remote_commit')
+
+      workspace.stub(:tree).and_return(tree)
+      workspace.stub(:remote_commit).and_return(remote_commit)
+
+      Dandelion::Changeset.should_receive(:new).with(tree, remote_commit, workspace.config).and_return(changeset)
+
+      expect(workspace.changeset).to eq changeset
+    end
+  end
+end

data/{test/test_git.git → spec/fixtures/repo.git}/config

@@ -3,3 +3,4 @@
 	filemode = true
 	bare = true
 	ignorecase = true
+	precomposeunicode = false

data/{test/test_git.git → spec/fixtures/repo.git}/hooks/pre-commit.sample

@@ -18,6 +18,9 @@ fi
 # If you want to allow non-ascii filenames set this variable to true.
 allownonascii=$(git config hooks.allownonascii)
 
+# Redirect output to stderr.
+exec 1>&2
+
 # Cross platform projects tend to avoid non-ascii filenames; prevent
 # them from being added to the repository. We exploit the fact that the
 # printable range starts at the space character and ends with tilde.
@@ -25,8 +28,8 @@ if [ "$allownonascii" != "true" ] &&
 	# Note that the use of brackets around a tr range is ok here, (it's
 	# even required, for portability to Solaris 10's /usr/bin/tr), since
 	# the square bracket bytes happen to fall in the designated range.
-	test "$(git diff --cached --name-only --diff-filter=A -z $against |
-	  LC_ALL=C tr -d '[ -~]\0')"
+	test $(git diff --cached --name-only --diff-filter=A -z $against |
+	  LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0
 then
 	echo "Error: Attempt to add a non-ascii file name."
 	echo
@@ -43,4 +46,5 @@ then
 	exit 1
 fi
 
+# If there are whitespace errors, print the offending file names and fail.
 exec git diff-index --check --cached $against --