wukong-deploy 0.0.1 → 0.0.2

data/Gemfile

@@ -1,3 +1,8 @@
-source                 :rubygems
+source :rubygems
 
 gemspec
+
+group :development do
+  gem 'rake',     '~> 0.9'
+  gem 'rspec',    '~> 2'
+end

data/README.md

@@ -38,6 +38,53 @@ The deploy pack is installed as a RubyGem:
 $ sudo gem install wukong-deploy
 ```
 
+## Usage
+
+Wukong-Deploy provides a command-line tool `wu-deploy` which can be
+used to create or interact with deploy packs.
+
+### Creating a New Deploy Pack
+
+Create a new deploy pack:
+
+```
+$ wu-deploy new my_app
+Within /home/user/my_app:
+      create  .
+      create  app/models
+      create  app/processors
+	  ...
+```
+
+This will create a directory `my_app` in the current directory.
+Passing the `dry_run` option will print what should happen without
+actually doing anything:
+
+```
+$ wu-deploy new my_app --dry_run
+Within /home/user/my_app:
+      create  .
+      create  app/models
+      create  app/processors
+	  ...
+```
+
+You'll be prompted if there is a conflict.  You can pass the `force`
+option to always overwrite files and the `skip` option to never
+overwrite files.
+
+### Working with an Existing Deploy Pack
+
+If your current directory is within an existing deploy pack you can
+start up an IRB console with the deploy pack's environment already
+loaded:
+
+```
+$ wu-deploy console
+irb(main):001:0> 
+```
+
+
 ## File Structure
 
 A deploy pack is a repository with the following

data/lib/wukong-deploy/configuration.rb

@@ -12,6 +12,30 @@ module Wukong
       case executable
       when 'wu-hadoop'
         Wukong::Elasticsearch.configure(settings) if executable == 'wu-hadoop'
+      when 'wu-deploy'
+        settings.define(:dry_run, :description => "Don't actually create or modify anything", :type => :boolean, :default => false)
+        settings.define(:skip,    :description => "Skip existing files", :type => :boolean, :default => false)
+        settings.define(:force,   :description => "Overwrite existing files", :type => :boolean, :default => false)
+        def settings.usage
+          "usage: wu-deploy ACTION [ --param=val | --param | -p val | -p ] ..."
+        end
+        settings.use(:commandline)
+        settings.description = <<EOF
+wu-deploy is a tool for creating and interacting with deploy packs.
+
+You can create a new deploy pack
+
+  $ wu-deploy new my_app
+
+The `--force' and `--skip' options can be used to control how conflict
+resolution works when creating files.  The `--dry_run` option can be
+used to see what happens without doing it.
+
+If you are within the directory of a deploy pack, you can enter an IRB
+console with the deploy pack's environment already loaded:
+
+  $ wu-deploy console
+EOF
       end
       settings
     end

data/lib/wukong-deploy/driver.rb

@@ -1,5 +1,3 @@
-
-
 module Wukong
   module Deploy
     class Driver
@@ -21,7 +19,7 @@ module Wukong
         when 'new'
           require_relative('templater')
           raise Error.new("Must provide a path to the root of the deploy pack you want to create") if args[1].nil? || args[1].blank?
-          Templater.new(File.expand_path(args[1], Dir.pwd)).create
+          Templater.new(File.expand_path(args[1], Dir.pwd), settings).run!
         when 'console'
           require_relative('console')
           Wukong::Deploy::Console.new.run!

data/lib/wukong-deploy/templater.rb

@@ -3,6 +3,8 @@ require 'fileutils'
 require 'erubis'
 
 require_relative('repo')
+require_relative('templater/messaging')
+require_relative('templater/conflict_resolution')
 
 module Wukong
   module Deploy
@@ -11,22 +13,35 @@ module Wukong
       attr_accessor :repo
       attr_accessor :options
 
-      include FileUtils::Verbose
+      include FileUtils
+      include Messaging
+      include ConflictResolution
 
       def initialize root, options={}
         self.repo    = Repo.new(root)
         self.options = options
       end
 
-      def create
+      def dry_run?
+        @options[:dry_run]
+      end
+
+      def run!
+        if dry_run?
+          puts "Would perform the following actions in #{repo.root}"
+        else
+          puts "Within #{repo.root}:"
+        end
         create_dirs
         create_templates
         create_gitkeeps
         create_gitignore
       end
-
+      
       def create_dirs
-        repo.dirs_to_create.each { |dir| mkdir_p(dir) }
+        repo.dirs_to_create.each do |dir|
+          create_directory(dir)
+        end
       end
 
       def create_templates
@@ -36,18 +51,16 @@ module Wukong
       end
 
       def create_template input_path, output_path, binding={}
-        input  = File.read(input_path)
-        erb    = Erubis::Eruby.new(input)
-        output = erb.result(binding)
-        action = File.exist?(output_path) ? 'modify' : 'create'
-        puts "#{action} #{output_path}"
-        File.open(output_path, 'w') { |f| f.puts(output) }
+        input   = File.read(input_path)
+        erb     = Erubis::Eruby.new(input)
+        content = erb.result(binding)
+        create_file(content, output_path)
       end
       
       def create_gitkeeps
         repo.dirs_to_create.each do |dir|
           if Dir[File.join(dir, '*')].empty?
-            touch(File.join(dir, '.gitkeep'))
+            create_file(empty_file, File.join(dir, '.gitkeep'))
           end
         end
       end
@@ -59,7 +72,33 @@ module Wukong
       def templates_dir
         @templates_dir ||= Pathname.new(File.expand_path('../../../templates', __FILE__))
       end
+
+      private
+
+      def empty_file
+        ""
+      end
       
+      def create_file content, path
+        if File.exist?(path)
+          handle_conflict(content, path)
+        else
+          message_create(path)
+          write_file(content, path)
+        end
+      end
+
+      def create_directory(dir)
+        message_create(dir)
+        return if dry_run?
+        mkdir_p(dir)
+      end
+
+      def write_file content, path
+        return if dry_run?
+        File.open(path, 'w') { |f| f.write(content) }
+      end
+
     end
   end
 end

data/lib/wukong-deploy/templater/conflict_resolution.rb

@@ -0,0 +1,57 @@
+require_relative("differ")
+
+module Wukong
+  module Deploy
+    module ConflictResolution
+
+      def handle_conflict(new_content, path)
+        existing_content = File.read(path)
+        case
+        when new_content == existing_content
+          message_same(path)
+        when always_replace?
+          message_replace(path)
+          write_file(new_content, path)
+        when never_replace?
+          message_skip(path)
+        else
+          message_conflict(path)
+          diff!(new_content, existing_content, path)
+        end
+      end
+
+      def always_replace?
+        @always_replace || options[:force]
+      end
+
+      def always_replace!
+        @always_replace = true
+      end
+
+      def never_replace?
+        @never_replace || options[:skip]
+      end
+
+      def never_replace!
+        @never_replace = true
+      end
+
+      private    
+
+      # :nodoc:
+      def diff! new_content, existing_content, path
+        differ = Differ.new(new_content, existing_content)
+        differ.resolve!
+        always_replace! if differ.always_replace?
+        never_replace!  if differ.never_replace?
+        if differ.replace?
+          message_replace(path)
+          write_file(new_content, path)
+        else
+          message_skip(path)
+        end
+      end
+
+    end
+  end
+end

data/lib/wukong-deploy/templater/differ.rb

@@ -0,0 +1,90 @@
+require 'diffy'
+
+module Wukong
+  module Deploy
+    class Differ
+
+      attr_accessor :new_content
+      attr_accessor :existing_content
+
+      def initialize new_content, existing_content
+        self.new_content      = new_content
+        self.existing_content = existing_content
+      end
+      
+      def replace?
+        @replace
+      end
+
+      def always_replace?
+        @always_replace
+      end
+
+      def never_replace?
+        @never_replace
+      end
+
+      def resolve!
+        response = get_response
+        case response
+        when /^y/
+          @replace        = true
+        when /^Y/
+          @replace        = true
+          @always_replace = true
+        when /^n/
+          @replace        = false
+        when /^N/
+          @replace        = false
+          @never_replace  = true
+        end
+      end
+
+      def diff
+        @diff = Diffy::Diff.new(new_content, existing_content, :allow_empty_diff => true, :diff => "-U 5", :include_diff_info => true)
+      end
+
+      def show_diff
+        puts ''
+        diff.each do |line|
+          puts "    #{line}"
+        end
+        puts ''
+      end
+
+      def show_help
+        puts "    Y - yes, overwrite this file and all other conflicts"
+        puts "    y - yes, overwrite this file"
+        puts "    N - no, skip this file and all other conflicts"
+        puts "    n - no, skip this file"
+        puts "    d - diff, show the differences between the existing file and the new file"
+        puts "    q - quit, abort"
+        puts "    h - help, show this help"
+      end
+      
+      def get_response
+        STDOUT.write '  Overwrite? (enter "h" for help) [YNynqdh]: '
+        begin
+          response = STDIN.readline.chomp.strip
+        rescue EOFError, Interrupt => e
+          exit(1)
+        end
+        case
+        when response =~ /^(y|n|Y|N)/
+          response
+        when response =~ /^q/i
+          exit(1)
+        when response =~ /^d/i
+          show_diff
+          get_response
+        when response =~ /^h/i
+          show_help
+          get_response
+        else
+          get_response
+        end
+      end
+      
+    end
+  end
+end

data/lib/wukong-deploy/templater/messaging.rb

@@ -0,0 +1,32 @@
+module Wukong
+  module Deploy
+    module Messaging
+      
+      def message action, *objects
+        puts [action.rjust(25), '  ', objects.map { |path| Pathname.new(path).relative_path_from(repo.root).to_s }.join(' ')].join
+      end
+
+      def message_create *objects
+        message "\e[32m\e[1mcreate\e[0m", *objects
+      end
+
+      def message_conflict *objects
+        message "\e[31m\e[1mconflict\e[0m", *objects
+      end
+      
+      def message_replace *objects
+        message "\e[31m\e[1mreplace\e[0m", *objects
+      end
+
+      def message_same *objects
+        message "\e[34m\e[1msame\e[0m", *objects
+      end
+      
+      def message_skip *objects
+        message "\e[35m\e[1mskip\e[0m", *objects
+      end
+    end
+  end
+end
+
+      

data/lib/wukong-deploy/version.rb

@@ -2,6 +2,6 @@ module Wukong
   module Deploy
 
     # The current version of this deploy pack framework.
-    VERSION = '0.0.1'
+    VERSION = '0.0.2'
   end
 end

data/spec/spec_helper.rb

@@ -0,0 +1,10 @@
+require 'rspec'
+require 'wukong-deploy'
+require 'wukong/spec_helpers'
+require_relative './support/integration_helper'
+
+RSpec.configure do |config|
+  config.mock_with :rspec
+  include Wukong::SpecHelpers
+  include Wukong::Deploy::IntegrationHelper
+end

data/spec/support/integration_helper.rb

@@ -0,0 +1,38 @@
+module Wukong
+  module Deploy
+    module IntegrationHelper
+
+      def root
+        @root ||= Pathname.new(File.expand_path('../../..', __FILE__))
+      end
+
+      def lib_dir *args
+        root.join('lib', *args)
+      end
+
+      def bin_dir *args
+        root.join('bin', *args)
+      end
+      
+      def examples_dir *args
+        root.join('examples', *args)
+      end
+
+      def integration_env
+        {
+          "PATH"    => [bin_dir.to_s, ENV["PATH"]].compact.join(':'),
+          "RUBYLIB" => [lib_dir.to_s, ENV["RUBYLIB"]].compact.join(':')
+        }
+      end
+
+      def integration_cwd
+        root.to_s
+      end
+
+      def example_script *args
+        examples_dir(*args)
+      end
+
+    end
+  end
+end

data/spec/wukong-deploy/wu_deploy_spec.rb

@@ -0,0 +1,94 @@
+require 'spec_helper'
+
+describe 'wu-deploy' do
+
+  before {`rm -rf #{examples_dir('*')}` }
+  after  {`rm -rf #{examples_dir('*')}` }
+
+  context "without arguments" do
+    subject { command('wu-deploy') }
+    it { should exit_with(:non_zero) }
+    it "displays a help message" do
+      should have_stderr(/usage: wu-deploy/)
+    end
+  end
+
+  context "creating a deploy pack" do
+
+    context "without a given path" do
+      subject { command('wu-deploy', 'new') }
+      it { should exit_with(:non_zero) }
+      it "prints an error message" do
+        should have_stderr(/path/)
+      end
+    end
+
+    context "with a given path" do
+      subject { command('wu-deploy', 'new', examples_dir("deploy_pack")) }
+      it { should exit_with(0) }
+      it "prints the files its creating" do
+        should have_stdout(/create.*config/, /create.*Gemfile/, /create.*\.gitignore/)
+      end
+      it "creates files on disk" do
+        subject.run!
+        Dir[examples_dir('deploy_pack', '*')].should_not be_empty
+      end
+    end
+    
+    context "with the --dry_run flag" do
+      subject { command('wu-deploy', 'new', examples_dir("deploy_pack"), '--dry_run') }
+      it { should exit_with(0) }
+      it "prints the files its creating" do
+        should have_stdout(/create.*config/, /create.*Gemfile/, /create.*\.gitignore/)
+      end
+      it "doesn't create files on disk" do
+        subject.run!
+        Dir[examples_dir('deploy_pack', '*')].should be_empty
+      end
+    end
+
+    context "on top of an existing deploy pack" do
+      before  { command('wu-deploy', 'new', examples_dir("deploy_pack")).run! }
+      subject { command('wu-deploy', 'new', examples_dir("deploy_pack")) }
+      it { should exit_with(0) }
+      it "prints the files its creating and which ones are the same" do
+        should have_stdout(/create.*config/, /same.*Gemfile/, /same.*\.gitignore/)
+      end
+      context "with conflicts" do
+        before do
+          File.open(examples_dir("deploy_pack", "Gemfile"), 'w') { |f| f.puts "new content" }
+        end
+        context "that are skipped by hand" do
+          subject { command('wu-deploy', 'new', examples_dir("deploy_pack")) < "n" }
+          it { should exit_with(0) }
+          it "prints the files it skipped" do
+            should have_stdout(/create.*config/, /skip.*Gemfile/, /same.*\.gitignore/)
+          end
+        end
+        context "that are automatically skipped" do
+          subject { command('wu-deploy', 'new', examples_dir("deploy_pack"), "--skip") }
+          it { should exit_with(0) }
+          it "prints the files it skipped" do
+            should have_stdout(/create.*config/, /skip.*Gemfile/, /same.*\.gitignore/)
+          end
+        end
+        context "that are replaced" do
+          subject { command('wu-deploy', 'new', examples_dir("deploy_pack")) < "y" }
+          it { should exit_with(0) }
+          it "prints the files it replaced" do
+            should have_stdout(/create.*config/, /replace.*Gemfile/, /same.*\.gitignore/)
+          end
+        end
+        context "that are automatically replaced" do
+          subject { command('wu-deploy', 'new', examples_dir("deploy_pack"), "--force") }
+          it { should exit_with(0) }
+          it "prints the files it replaced" do
+            should have_stdout(/create.*config/, /replace.*Gemfile/, /same.*\.gitignore/)
+          end
+        end
+        
+      end
+    end
+  end
+end
+

data/templates/README.md.erb

@@ -1 +1,214 @@
-Welcome to your new deploy pack.
+f# Welcome to the Infochimps Platform!
+
+The [Infochimps Platform](http://www.infochimps.com) is an end-to-end,
+managed solution for building Big Data applications.  It integrates
+best-of-breed technologies like [Hadoop](http://hadoop.apache.org/),
+[Storm](https://github.com/nathanmarz/storm),
+[Kafka](http://incubator.apache.org/kafka/),
+[MongoDB](http://www.mongodb.org/),
+[ElasticSearch](http://www.elasticsearch.org/),
+[HBase](http://hbase.apache.org/), &c. and provides simple interfaces
+for accessing these powerful tools.
+
+Computation, analytics, scripting, &c. are all handled by
+[Wukong](http://github.com/infochimps-labs/wukong) within the
+platform.  Wukong is an abstract framework for defining computations
+on data.  Wukong processors and flows can run in many different
+execution contexts including:
+
+  * locally on the command-line for testing or development purposes
+  * as a Hadoop mapper or reducer for batch analytics or ETL
+  * within Storm as part of a real-time data flow
+
+The Infochimps Platform uses the concept of a deploy pack for
+developers to develop all their processors, flows, and jobs within.
+The deploy pack can be thought of as a container for all the necessary
+Wukong code and plugins useful in the context of an Infochimps
+Platform application.  It includes the following libraries:
+
+* <a href="http://github.com/infochimps-labs/wukong/tree/3.0.0">wukong</a>: The core framework for writing processors and chaining them together.
+* <a href="http://github.com/infochimps-labs/wukong-hadoop">wukong-hadoop</a>: Run Wukong processors as mappers and reducers within the Hadoop framework.  Model Hadoop jobs locally before you run them.
+* <a href="http://github.com/infochimps-labs/wonderdog">wonderdog</a>: Connect Wukong processors running within Hadoop to Elasticsearch as either a source or sink for data.
+* <a href="http://github.com/infochimps-labs/wukong-deploy">wukong-deploy</a>: Code for coordinating Wukong and its plugins in a deploy pack.
+
+**This is your deploy pack!** You will build your data processing
+pipelines and Hadoop jobs within this repo.
+
+## Setup
+
+### Dependencies
+
+In order to install and run a deploy pack you need the following
+dependencies:
+
+#### Ruby 1.9.x
+
+Wukong and the deploy pack framework will only run on Ruby 1.9.  There
+are a lot of [online
+instructions](http://www.ruby-lang.org/en/downloads/) you can use to
+get Ruby 1.9 (and RubyGems) installed and configured on your local
+system.
+
+If you use [rvm](https://rvm.io/) or
+[rbenv](https://github.com/sstephenson/rbenv) to manage your Ruby
+installations, make sure you install all gems appropriately and invoke
+bundler appropriately in what follows.
+
+#### Git
+
+You'll need [Git](http://git-scm.com/) to push/pull your deploy pack
+code to/from the Infochimps Platform.
+
+### Creating/Cloning the Deploy Pack
+
+The first thing you need to do to get started is get a local copy of
+this deploy on your computer.  If you have already been giving a
+deploy pack by Infochimps then you'll want to clone it:
+
+```
+$ git clone <your-deploy-pack-git-url>
+```
+
+If you are creating a deploy pack from scratch you'll want to use the
+`wu-deploy` tool to create the scaffold of your deploy pack for you:
+
+```
+$ sudo gem install wukong-deploy
+$ wu-deploy new <my-app-name>
+```
+
+Once you have the deploy pack on disk, you can install the
+dependencies and
+
+### Installation
+
+From within the root of your deploy pack run the following commands
+
+```
+$ sudo gem install bundler
+$ bundle install --standalone
+```
+
+If you're using [rbenv](https://github.com/sstephenson/rbenv) you may
+want to run `rbenv exec bundle install --standalone`.
+
+Bundler will install all the necessary dependencies locally in a
+directory called `bundle`.  We use a `standalone` installation of your
+application bundle because this makes it easier to connect code in the
+deploy pack to frameworks like Hadoop, Storm, &c. when your code is
+running within the Infochimps Platform.
+
+### Configuration
+
+Your deploy pack doesn't need any configuration out of the box.  As
+you begin to extend it you may add functionality which benefits from
+the ability to be configured.
+
+Put any configuration you want shared across all environments into the
+file `config/settings.yml`.  Override this with environment-specific
+configuration in the appropriate file within `config/environments`.
+
+As an example, you may write a processor like this:
+
+```ruby
+Wukong.procesor(:configurable_decorator) do
+  field :suffix, String, :default => '.'
+  def process record
+    yield [record, suffix].join
+  end
+end
+```
+
+This processor's `suffix` property can be set on the command-line:
+
+```
+$ cat input
+1
+2
+3
+$ cat input | wu-local configurable_decorator
+1.
+2.
+3.
+$ cat input | wu-local configurable_decorator --suffix=','
+1,
+2,
+3,
+
+You can also set the same property in a configuration file, scoped by
+the name of the processor:
+
+```yaml
+# in config/settings.yml
+---
+
+configurable_decorator:
+  suffix: ,
+```
+
+which lets you the `--suffix` flag on the command-line while still
+overriding the default setting.  You can also put such settings in
+environment specific files within `config/environments`.
+
+## File Structure
+
+A deploy pack is a repository with the following
+[Rails](http://rubyonrails.org/)-like file structure:
+
+```
+├──   app
+│   ├──   models
+│   ├──   processors
+│   ├──   flows
+│   └──   jobs
+├──   config
+│   ├──   environment.rb
+│   ├──   application.rb
+│   ├──   initializers
+│   ├──   settings.yml
+│   └──   environments
+│       ├──   development.yml
+│       ├──   production.yml
+│       └──   test.yml
+├──   data
+├──   Gemfile
+├──   Gemfile.lock
+├──   lib
+├──   log
+├──   Rakefile
+├──   spec
+│   ├──   spec_helper.rb
+│   └──   support
+└──   tmp
+```
+
+Let's look at it piece by piece:
+
+* <b>app</b>: The directory with all the action.  It's where you define:
+  * <b>models</b>: Your domain models or "nouns", which define and wrap the different kinds of data elements in your application.  They are built using whatever framework you like (defaults to [Gorillib](http://github.com/infochimps-labs/gorillib))
+  * <b>processors</b>: Your fundamental operations or "verbs", which are passed records and parse, filter, augment, normalize, or split them.
+  * <b>flows</b>: Chain together processors into streaming flows for ingestion, real-time processing, or [complex event processing](http://en.wikipedia.org/wiki/Complex_event_processing) (CEP)
+  * <b>jobs</b>: Pair processors together to create batch jobs to run in Hadoop
+* <b>config</b>: Where you place all application configuration for all environments
+  * <b>environment.rb</b>: Defines the runtime environment for all code, requiring and configuring all Wukong framework code.  You shouldn't have to edit this file directly.
+  * <b>application.rb</b>: Require and configure libraries specific to your application.  Choose a model framework, pick what application code gets loaded by default (vs. auto-loaded).
+  * <b>initializers</b>: Holds any files you need to load before <b>application.rb</b> here.  Useful for requiring and configuring external libraries.
+  * <b>settings.yml</b>: Defines application-wide settings.
+  * <b>environments</b>: Defines environment-specific settings in YAML files named after the environment.  Overrides <b>config/settings.yml</b>.
+* <b>data</b>: Holds sample data in flat files.  You'll develop and test your application using this data.
+* <b>Gemfile</b> and <b>Gemfile.lock</b>: Defines how libraries are resolved with [Bundler](http://gembundler.com/).
+* <b>lib</b>: Holds any code you want to use in your application but that isn't "part of" your application (like vendored libraries, Rake tasks, &c.).
+* <b>log</b>: A good place to stash logs.
+* <b>Rakefile</b>: Defines [Rake](http://rake.rubyforge.org/) tasks for the development, test, and deploy of your application.
+* <b>spec</b>: Holds all your [RSpec](http://rspec.info/) unit tests.
+  * <b>spec_helper.rb</b>: Loads libraries you'll use during testing, includes spec helper libraries from Wukong.
+  * <b>support</b>: Holds support code for your tests.
+* <b>tmp</b>: A good place to stash temporary files.
+
+## Writing your first models, processors, flows, and jobs
+
+Before you start developing, it might be helpful to read up on some of
+the underlying documentation for Wukong and its plugins, specifically:
+
+* on [Wukong](http://github.com/infochimps-labs/wukong/tree/3.0.0) so you understand the basic idea of a processor and how to glue processors together
+* on [Wukong-Hadoop](http://github.com/infochimps-labs/wukong-hadoop) so you understand how to move between local and Hadoop modes for batch analytics

data/templates/config/application.rb.erb

@@ -62,5 +62,3 @@ require 'gorillib/object/blank'
 Dir[File.expand_path('../../app/models/**/*.rb', __FILE__)].each     { |path| require(path) }
 Dir[File.expand_path('../../app/processors/**/*.rb', __FILE__)].each { |path| require(path) }
 Dir[File.expand_path('../../app/flows/**/*.rb', __FILE__)].each      { |path| require(path) }
-Dir[File.expand_path('../../app/jobs/**/*.rb', __FILE__)].each       { |path| require(path) }
-Dir[File.expand_path('../../app/**/*.rb', __FILE__)].each            { |path| require(path) }

data/wukong-deploy.gemspec

@@ -35,13 +35,11 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(/^spec/)
   gem.require_paths = ['lib']
 
-  gem.add_dependency('wukong', '3.0.0.pre2')
-  gem.add_dependency('wukong-hadoop')
-  gem.add_dependency('wonderdog')
+  gem.add_dependency('wukong',        '3.0.0.pre3')
+  gem.add_dependency('wukong-hadoop', '>= 0.0.2')
+  gem.add_dependency('wonderdog',     '>= 0.0.2')
   gem.add_dependency('erubis')
-  
+  gem.add_dependency('diffy')
   gem.add_dependency('rake',     '~> 0.9')
-  gem.add_development_dependency 'rspec',    '~> 2'
-  
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wukong-deploy
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-01 00:00:00.000000000 Z
+date: 2012-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: wukong
@@ -20,7 +20,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0.pre2
+        version: 3.0.0.pre3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -28,7 +28,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0.pre2
+        version: 3.0.0.pre3
 - !ruby/object:Gem::Dependency
   name: wukong-hadoop
   requirement: !ruby/object:Gem::Requirement
@@ -36,7 +36,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -44,7 +44,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: wonderdog
   requirement: !ruby/object:Gem::Requirement
@@ -52,7 +52,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -60,7 +60,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement
@@ -78,37 +78,37 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: diffy
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2'
-  type: :development
+        version: '0.9'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '0.9'
 description: ! "  The Infochimps Platform is an end-to-end, managed solution for\n
   \ building Big Data applications.  It integrates best-of-breed\n  technologies like
   Hadoop, Storm, Kafka, MongoDB, ElasticSearch,\n  HBase, &c. and provides simple
@@ -132,6 +132,7 @@ files:
 - README.md
 - Rakefile
 - bin/wu-deploy
+- examples/.gitkeep
 - lib/wukong-deploy.rb
 - lib/wukong-deploy/configuration.rb
 - lib/wukong-deploy/console.rb
@@ -140,7 +141,13 @@ files:
 - lib/wukong-deploy/repo.rb
 - lib/wukong-deploy/tasks.rb
 - lib/wukong-deploy/templater.rb
+- lib/wukong-deploy/templater/conflict_resolution.rb
+- lib/wukong-deploy/templater/differ.rb
+- lib/wukong-deploy/templater/messaging.rb
 - lib/wukong-deploy/version.rb
+- spec/spec_helper.rb
+- spec/support/integration_helper.rb
+- spec/wukong-deploy/wu_deploy_spec.rb
 - templates/Gemfile.erb
 - templates/README.md.erb
 - templates/Rakefile.erb
@@ -179,5 +186,8 @@ rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Defines the deploy pack framework used by the Infochimps Platform
-test_files: []
+test_files:
+- spec/spec_helper.rb
+- spec/support/integration_helper.rb
+- spec/wukong-deploy/wu_deploy_spec.rb
 has_rdoc: