dandelion 0.3.15 → 0.4.0.beta2

data/spec/fixtures/repo.git/hooks/pre-push.sample

@@ -0,0 +1,53 @@
+#!/bin/sh
+
+# An example hook script to verify what is about to be pushed.  Called by "git
+# push" after it has checked the remote status, but before anything has been
+# pushed.  If this script exits with a non-zero status nothing will be pushed.
+#
+# This hook is called with the following parameters:
+#
+# $1 -- Name of the remote to which the push is being done
+# $2 -- URL to which the push is being done
+#
+# If pushing without using a named remote those arguments will be equal.
+#
+# Information about the commits which are being pushed is supplied as lines to
+# the standard input in the form:
+#
+#   <local ref> <local sha1> <remote ref> <remote sha1>
+#
+# This sample shows how to prevent push of commits where the log message starts
+# with "WIP" (work in progress).
+
+remote="$1"
+url="$2"
+
+z40=0000000000000000000000000000000000000000
+
+IFS=' '
+while read local_ref local_sha remote_ref remote_sha
+do
+	if [ "$local_sha" = $z40 ]
+	then
+		# Handle delete
+	else
+		if [ "$remote_sha" = $z40 ]
+		then
+			# New branch, examine all commits
+			range="$local_sha"
+		else
+			# Update to existing branch, examine new commits
+			range="$remote_sha..$local_sha"
+		fi
+
+		# Check for WIP commit
+		commit=`git rev-list -n 1 --grep '^WIP' "$range"`
+		if [ -n "$commit" ]
+		then
+			echo "Found WIP commit in $local_ref, not pushing"
+			exit 1
+		fi
+	fi
+done
+
+exit 0

data/{test/test_git.git → spec/fixtures/repo.git}/hooks/update.sample

@@ -38,7 +38,7 @@ if [ -z "$GIT_DIR" ]; then
 fi
 
 if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then
-	echo "Usage: $0 <ref> <oldrev> <newrev>" >&2
+	echo "usage: $0 <ref> <oldrev> <newrev>" >&2
 	exit 1
 fi
 

data/spec/fixtures/repo.git/refs/heads/master

@@ -0,0 +1 @@
+3d9b743acb4a84dd99002d2c6f3fcf1a47e9f06b

data/spec/spec_helper.rb

@@ -0,0 +1,28 @@
+require 'dandelion'
+require 'rugged'
+
+Dandelion.logger.level = Logger::UNKNOWN
+
+def test_repo
+  path = File.join(File.dirname(__FILE__), 'fixtures', 'repo.git')
+  @repo ||= Rugged::Repository.new(path)
+end
+
+def test_commits
+  [
+    test_repo.lookup('e289ff1e2729839759dbd6fe99b6e35880910c7c'),
+    test_repo.lookup('3d9b743acb4a84dd99002d2c6f3fcf1a47e9f06b')
+  ]
+end
+
+def test_tree
+  Dandelion::Tree.new(test_repo, test_commits.last)
+end
+
+def test_changeset(options = {})
+  Dandelion::Changeset.new(test_tree, test_commits.first, options)
+end
+
+def test_diff
+  test_changeset.diff
+end

metadata

@@ -1,80 +1,40 @@
 --- !ruby/object:Gem::Specification
 name: dandelion
 version: !ruby/object:Gem::Version
-  version: 0.3.15
+  version: 0.4.0.beta2
 platform: ruby
 authors:
 - Scott Nelson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-23 00:00:00.000000000 Z
+date: 2014-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: grit
+  name: rugged
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.4.1
+        version: 0.19.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.4.1
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.9.12
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.9.12
-- !ruby/object:Gem::Dependency
-  name: net-sftp
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 2.0.5
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 2.0.5
-- !ruby/object:Gem::Dependency
-  name: aws-s3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-description: Incremental Git repository deployment
+        version: 0.19.0
+description: 
 email:
-- scottbnel@gmail.com
+- scott@scttnlsn.com
 executables:
 - dandelion
 extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
@@ -82,54 +42,76 @@ files:
 - bin/dandelion
 - dandelion.gemspec
 - lib/dandelion.rb
-- lib/dandelion/application.rb
-- lib/dandelion/backend.rb
-- lib/dandelion/backend/ftp.rb
-- lib/dandelion/backend/s3.rb
-- lib/dandelion/backend/sftp.rb
+- lib/dandelion/adapter.rb
+- lib/dandelion/adapter/ftp.rb
+- lib/dandelion/adapter/noop.rb
+- lib/dandelion/adapter/s3.rb
+- lib/dandelion/adapter/sftp.rb
+- lib/dandelion/change.rb
+- lib/dandelion/changeset.rb
+- lib/dandelion/cli.rb
 - lib/dandelion/command.rb
 - lib/dandelion/command/deploy.rb
 - lib/dandelion/command/status.rb
-- lib/dandelion/deployment.rb
-- lib/dandelion/git.rb
+- lib/dandelion/config.rb
+- lib/dandelion/deployer.rb
+- lib/dandelion/diff.rb
+- lib/dandelion/tree.rb
+- lib/dandelion/utils.rb
 - lib/dandelion/version.rb
-- test/fixtures/diff
-- test/fixtures/ls_tree
-- test/test_diff_deployment.rb
-- test/test_ftp.rb
-- test/test_git.git/HEAD
-- test/test_git.git/config
-- test/test_git.git/description
-- test/test_git.git/hooks/applypatch-msg.sample
-- test/test_git.git/hooks/commit-msg.sample
-- test/test_git.git/hooks/post-commit.sample
-- test/test_git.git/hooks/post-receive.sample
-- test/test_git.git/hooks/post-update.sample
-- test/test_git.git/hooks/pre-applypatch.sample
-- test/test_git.git/hooks/pre-commit.sample
-- test/test_git.git/hooks/pre-rebase.sample
-- test/test_git.git/hooks/prepare-commit-msg.sample
-- test/test_git.git/hooks/update.sample
-- test/test_git.git/info/exclude
-- test/test_git.git/objects/0c/a605e9f0f1d42ce8193ac36db11ec3cc9efc08
-- test/test_git.git/objects/11/bada4e36fd065c8d1d3ca97b8dffa496c8e021
-- test/test_git.git/objects/57/16ca5987cbf97d6bb54920bea6adde242d87e6
-- test/test_git.git/objects/88/d4480861346093048e08ce8dcc577d8aa69379
-- test/test_git.git/objects/90/2dce0535b19f0c15ac8407fc4468256ad672d7
-- test/test_git.git/objects/a6/394b3e8a82b76b0dd5b6b317f489dfe22426a6
-- test/test_git.git/objects/a6/5140d5ec9f47064f614ecf8e43776baa5c0c11
-- test/test_git.git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391
-- test/test_git.git/objects/ea/41dba10b54a794284e0be009a11f0ff3716a28
-- test/test_git.git/objects/f5/5f3c44c89e5d215fbaaef9d33563117fe0b61b
-- test/test_git.git/objects/ff/1f1d4bd0c99e1c9cca047c46b2194accf89504
-- test/test_git.git/refs/heads/master
-- test/test_git.rb
-- test/test_sftp.rb
-homepage: http://github.com/scttnlsn/dandelion
+- lib/dandelion/workspace.rb
+- spec/dandelion/adapter_spec.rb
+- spec/dandelion/change_spec.rb
+- spec/dandelion/changeset_spec.rb
+- spec/dandelion/command/deploy_spec.rb
+- spec/dandelion/command/status_spec.rb
+- spec/dandelion/command_spec.rb
+- spec/dandelion/config_spec.rb
+- spec/dandelion/deployer_spec.rb
+- spec/dandelion/diff_spec.rb
+- spec/dandelion/tree_spec.rb
+- spec/dandelion/workspace_spec.rb
+- spec/fixtures/repo.git/HEAD
+- spec/fixtures/repo.git/config
+- spec/fixtures/repo.git/description
+- spec/fixtures/repo.git/hooks/applypatch-msg.sample
+- spec/fixtures/repo.git/hooks/commit-msg.sample
+- spec/fixtures/repo.git/hooks/post-update.sample
+- spec/fixtures/repo.git/hooks/pre-applypatch.sample
+- spec/fixtures/repo.git/hooks/pre-commit.sample
+- spec/fixtures/repo.git/hooks/pre-push.sample
+- spec/fixtures/repo.git/hooks/pre-rebase.sample
+- spec/fixtures/repo.git/hooks/prepare-commit-msg.sample
+- spec/fixtures/repo.git/hooks/update.sample
+- spec/fixtures/repo.git/info/exclude
+- spec/fixtures/repo.git/objects/25/7cc5642cb1a054f08cc83f2d943e56fd3ebe99
+- spec/fixtures/repo.git/objects/34/e64fe350f3ea80c989cdac7a99c2adb8574fca
+- spec/fixtures/repo.git/objects/3d/9b743acb4a84dd99002d2c6f3fcf1a47e9f06b
+- spec/fixtures/repo.git/objects/4e/44973d41d33bf5342037f56497efe0a9604d25
+- spec/fixtures/repo.git/objects/57/16ca5987cbf97d6bb54920bea6adde242d87e6
+- spec/fixtures/repo.git/objects/6c/a0f54491390579ce9438ec89c64c6b3499683a
+- spec/fixtures/repo.git/objects/8a/e33865a630c5d141c8a498f0c0166ff240b433
+- spec/fixtures/repo.git/objects/90/2dce0535b19f0c15ac8407fc4468256ad672d7
+- spec/fixtures/repo.git/objects/c3/9af82404cc4267b1ba5f4b4437a511e0776abb
+- spec/fixtures/repo.git/objects/c8/85b3f693ed6e2926971ef75680f41b318072ae
+- spec/fixtures/repo.git/objects/d8/7cbcba0e2ede0752bdafc5938da35546803ba5
+- spec/fixtures/repo.git/objects/e2/89ff1e2729839759dbd6fe99b6e35880910c7c
+- spec/fixtures/repo.git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391
+- spec/fixtures/repo.git/objects/ea/41dba10b54a794284e0be009a11f0ff3716a28
+- spec/fixtures/repo.git/objects/ee/314a31b622b027c10981acaed7903a3607dbd4
+- spec/fixtures/repo.git/objects/f6/66b137794d56880bab05e8fd256713a8fccf92
+- spec/fixtures/repo.git/refs/heads/master
+- spec/spec_helper.rb
+homepage: https://github.com/scttnlsn/dandelion
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message: |
+  !   The 'dandelion' gem is installed but you may need to install additional
+  !   gems depending on the adapters you intend to use.
+  !
+  !   Running 'dandelion status' in your project directory will indicate which
+  !   additional gems need to be installed.
 rdoc_options: []
 require_paths:
 - lib
@@ -140,45 +122,55 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
-summary: dandelion-0.3.15
+summary: Incremental Git repository deployment
 test_files:
-- test/fixtures/diff
-- test/fixtures/ls_tree
-- test/test_diff_deployment.rb
-- test/test_ftp.rb
-- test/test_git.git/HEAD
-- test/test_git.git/config
-- test/test_git.git/description
-- test/test_git.git/hooks/applypatch-msg.sample
-- test/test_git.git/hooks/commit-msg.sample
-- test/test_git.git/hooks/post-commit.sample
-- test/test_git.git/hooks/post-receive.sample
-- test/test_git.git/hooks/post-update.sample
-- test/test_git.git/hooks/pre-applypatch.sample
-- test/test_git.git/hooks/pre-commit.sample
-- test/test_git.git/hooks/pre-rebase.sample
-- test/test_git.git/hooks/prepare-commit-msg.sample
-- test/test_git.git/hooks/update.sample
-- test/test_git.git/info/exclude
-- test/test_git.git/objects/0c/a605e9f0f1d42ce8193ac36db11ec3cc9efc08
-- test/test_git.git/objects/11/bada4e36fd065c8d1d3ca97b8dffa496c8e021
-- test/test_git.git/objects/57/16ca5987cbf97d6bb54920bea6adde242d87e6
-- test/test_git.git/objects/88/d4480861346093048e08ce8dcc577d8aa69379
-- test/test_git.git/objects/90/2dce0535b19f0c15ac8407fc4468256ad672d7
-- test/test_git.git/objects/a6/394b3e8a82b76b0dd5b6b317f489dfe22426a6
-- test/test_git.git/objects/a6/5140d5ec9f47064f614ecf8e43776baa5c0c11
-- test/test_git.git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391
-- test/test_git.git/objects/ea/41dba10b54a794284e0be009a11f0ff3716a28
-- test/test_git.git/objects/f5/5f3c44c89e5d215fbaaef9d33563117fe0b61b
-- test/test_git.git/objects/ff/1f1d4bd0c99e1c9cca047c46b2194accf89504
-- test/test_git.git/refs/heads/master
-- test/test_git.rb
-- test/test_sftp.rb
+- spec/dandelion/adapter_spec.rb
+- spec/dandelion/change_spec.rb
+- spec/dandelion/changeset_spec.rb
+- spec/dandelion/command/deploy_spec.rb
+- spec/dandelion/command/status_spec.rb
+- spec/dandelion/command_spec.rb
+- spec/dandelion/config_spec.rb
+- spec/dandelion/deployer_spec.rb
+- spec/dandelion/diff_spec.rb
+- spec/dandelion/tree_spec.rb
+- spec/dandelion/workspace_spec.rb
+- spec/fixtures/repo.git/HEAD
+- spec/fixtures/repo.git/config
+- spec/fixtures/repo.git/description
+- spec/fixtures/repo.git/hooks/applypatch-msg.sample
+- spec/fixtures/repo.git/hooks/commit-msg.sample
+- spec/fixtures/repo.git/hooks/post-update.sample
+- spec/fixtures/repo.git/hooks/pre-applypatch.sample
+- spec/fixtures/repo.git/hooks/pre-commit.sample
+- spec/fixtures/repo.git/hooks/pre-push.sample
+- spec/fixtures/repo.git/hooks/pre-rebase.sample
+- spec/fixtures/repo.git/hooks/prepare-commit-msg.sample
+- spec/fixtures/repo.git/hooks/update.sample
+- spec/fixtures/repo.git/info/exclude
+- spec/fixtures/repo.git/objects/25/7cc5642cb1a054f08cc83f2d943e56fd3ebe99
+- spec/fixtures/repo.git/objects/34/e64fe350f3ea80c989cdac7a99c2adb8574fca
+- spec/fixtures/repo.git/objects/3d/9b743acb4a84dd99002d2c6f3fcf1a47e9f06b
+- spec/fixtures/repo.git/objects/4e/44973d41d33bf5342037f56497efe0a9604d25
+- spec/fixtures/repo.git/objects/57/16ca5987cbf97d6bb54920bea6adde242d87e6
+- spec/fixtures/repo.git/objects/6c/a0f54491390579ce9438ec89c64c6b3499683a
+- spec/fixtures/repo.git/objects/8a/e33865a630c5d141c8a498f0c0166ff240b433
+- spec/fixtures/repo.git/objects/90/2dce0535b19f0c15ac8407fc4468256ad672d7
+- spec/fixtures/repo.git/objects/c3/9af82404cc4267b1ba5f4b4437a511e0776abb
+- spec/fixtures/repo.git/objects/c8/85b3f693ed6e2926971ef75680f41b318072ae
+- spec/fixtures/repo.git/objects/d8/7cbcba0e2ede0752bdafc5938da35546803ba5
+- spec/fixtures/repo.git/objects/e2/89ff1e2729839759dbd6fe99b6e35880910c7c
+- spec/fixtures/repo.git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391
+- spec/fixtures/repo.git/objects/ea/41dba10b54a794284e0be009a11f0ff3716a28
+- spec/fixtures/repo.git/objects/ee/314a31b622b027c10981acaed7903a3607dbd4
+- spec/fixtures/repo.git/objects/f6/66b137794d56880bab05e8fd256713a8fccf92
+- spec/fixtures/repo.git/refs/heads/master
+- spec/spec_helper.rb

data/lib/dandelion/application.rb

@@ -1,73 +0,0 @@
-require 'dandelion/command'
-
-module Dandelion
-  class Application
-    class << self
-      def execute(args)
-        new(args).execute
-      end
-    end
-
-    def initialize(args)
-      @args = args
-      @options = {}
-      @parser = OptionParser.new
-    end
-
-    def execute
-      global = Command::Base.parser(@options)
-      parse(global)
-
-      begin
-        name = @args.shift
-        command = Command::Base.create(name)
-        parse(command.parser(@options))
-      rescue Command::InvalidCommandError
-        log.fatal("Invalid command: #{name}")
-        log.fatal(global.help)
-        log.fatal("Available commands:")
-        log.fatal(Command::Base.commands.map { |name| "    #{name}" }.join("\n"))
-        exit 1
-      end
-      
-      prepare
-      validate
-      
-      command.new(@options) do |cmd|
-        cmd.setup(@args) if cmd.respond_to?(:setup)
-        cmd.execute
-      end
-    end
-    
-    def log
-      Dandelion.logger
-    end
-
-    private
-
-    def parse(parser)
-      begin
-        parser.order!(@args)
-      rescue OptionParser::InvalidOption => e
-        log.fatal(e.to_s.capitalize)
-        log.fatal(parser.help)
-        exit 1
-      end
-    end
-    
-    def prepare
-      @options[:config] ||= File.join(@options[:repo], 'dandelion.yml')
-    end
-    
-    def validate
-      unless File.exists?(File.join(@options[:repo], '.git'))
-        log.fatal("Not a git repository: #{@options[:repo]}")
-        exit 1
-      end
-      unless File.exists?(@options[:config])
-        log.fatal("Could not find file: #{@options[:config]}")
-        exit 1
-      end
-    end
-  end
-end