pipely 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f9c4a0bcff7b3feb94912a01d1b05b766719478
-  data.tar.gz: 0e425032da77535e9d1a3536f602fa21d6cd7902
+  metadata.gz: 304e00b3319254cb54534703c1d0349fc1bee849
+  data.tar.gz: 9d33ed9a0eae6d2eab28329d041801cbc82d252a
 SHA512:
-  metadata.gz: 747f2bb935bb19e48bd750f20e5fbe6947ef933126e103700b2e200db9a45042c1279c6c017ecb74b17d256d63cad35e835c77d13a858d84dcf4a5551e26412a
-  data.tar.gz: a2c072193e1ed2e98932f725f0ecf230efd2521f4f37be822964566fc4d8cc87c34e68bee4e4d78865f797ec0e1a5acc8b135dd7200523f39510cf42f917e3ee
+  metadata.gz: 3218c97c5efba3b81e86bff225655c9ac09a5223973e7c5514cb1956f5178d192879d53da96218ad87e2a0062ecbc70cb5163cb4de6e4df7c4c1a7b5ba5a65da
+  data.tar.gz: 3f3e63d34afd93f3216fd4827dfb222497c5d436923cd7214e9949984355ccd9540636c58d66e8b6fb7ec7c810f90deb4f81950dcaa313e8b7981caf5ab73b49

data/lib/pipely/build/definition.rb

@@ -4,6 +4,10 @@ module Pipely
     # Represent a pipeline definition, built from a Template and some config.
     #
     class Definition < Struct.new(:template, :env, :config)
+      extend Forwardable
+
+      def_delegators :template, :pipeline_id=, :pipeline_id
+
       def pipeline_name
         config[:name]
       end

data/lib/pipely/build/template.rb

@@ -12,6 +12,8 @@ module Pipely
     class Template
       include TemplateHelpers
 
+      attr_accessor :pipeline_id
+
       def initialize(source)
         @source = source
         @config = {}

data/lib/pipely/deploy/client.rb

@@ -33,7 +33,7 @@ module Pipely
         @aws = AWS::DataPipeline.new.client
       end
 
-      def deploy_pipeline(pipeline_basename, definition)
+      def deploy_pipeline(pipeline_basename, definition=nil, &block)
         pipeline_name = [
           ('P' if ENV['env'] == 'production'),
           ENV['USER'],
@@ -47,9 +47,10 @@ module Pipely
         @log.info("#{pipeline_ids.count} existing pipelines: #{pipeline_ids}")
 
         # Create new pipeline
-        created_pipeline_id = create_pipeline(pipeline_name,
-                                              definition,
-                                              tags)
+        created_pipeline_id = create_pipeline(
+          pipeline_name, definition, tags, &block
+        )
+
         if created_pipeline_id
           @log.info("Created pipeline id '#{created_pipeline_id}'")
 
@@ -96,6 +97,8 @@ module Pipely
           tags: default_tags.merge(tags)
         )
 
+        definition ||= yield(created_pipeline.id) if block_given?
+
         # Use aws-sdk gem, instead of Fog, to put definition and activate
         # pipeline, for improved reporting of validation errors.
         #
@@ -104,13 +107,17 @@ module Pipely
           pipeline_objects: JSONDefinition.parse(definition)
         )
 
+        activate_pipeline(response, created_pipeline)
+      end
+
+      def activate_pipeline(response, pipeline)
         if response[:errored]
           @log.error("Failed to put pipeline definition.")
           @log.error(response[:validation_errors].inspect)
           false
         else
-          @aws.activate_pipeline(pipeline_id: created_pipeline.id)
-          created_pipeline.id
+          @aws.activate_pipeline(pipeline_id: pipeline.id)
+          pipeline.id
         end
       end
 

data/lib/pipely/tasks/deploy.rb

@@ -54,10 +54,11 @@ module Pipely
       def run_task(verbose)
         Rake::Task["upload_steps"].invoke
 
-        Pipely::Deploy::Client.new.deploy_pipeline(
-          definition.pipeline_name,
-          definition.to_json
-        )
+        Pipely::Deploy::Client.new
+          .deploy_pipeline(definition.pipeline_name) do |pipeline_id|
+            definition.pipeline_id = pipeline_id
+            definition.to_json
+          end
       end
 
     end

data/lib/pipely/version.rb

@@ -1,3 +1,3 @@
 module Pipely
-  VERSION = '0.11.0' unless defined?(::Pipely::VERSION)
+  VERSION = '0.12.0' unless defined?(::Pipely::VERSION)
 end

data/spec/lib/pipely/deploy/client_spec.rb

@@ -15,7 +15,7 @@ describe Pipely::Deploy::Client do
 
       subject.should_receive(:create_pipeline).
         with("#{ENV['USER']}:#{pipeline_basename}",
-             anything(),
+             nil,
              hash_including( 'basename' => pipeline_basename )
         ).
         and_return(new_pipeline_id)
@@ -24,7 +24,30 @@ describe Pipely::Deploy::Client do
         subject.should_receive(:delete_pipeline).with(id)
       end
 
-      subject.deploy_pipeline(pipeline_basename, definition)
+      subject.deploy_pipeline(pipeline_basename) { definition }
+    end
+  end
+
+  describe '#create_pipeline' do
+    let(:pipeline_name) { 'NewPipeline' }
+    let(:pipeline_id) { 123 }
+    let(:created_pipeline) { double(:created_pipeline, id: pipeline_id) }
+    let(:definition) { "Pipeline ID: 123" }
+
+    let(:data_pipelines) { subject.instance_variable_get(:@data_pipelines) }
+    let(:aws) { subject.instance_variable_get(:@aws) }
+
+    it 'gets the definition from the block' do
+      data_pipelines.stub_chain(:pipelines, :create)
+        .and_return(created_pipeline)
+
+      Pipely::Deploy::JSONDefinition.should_receive(:parse).with(definition)
+
+      aws.should_receive(:put_pipeline_definition).and_return({})
+      aws.should_receive(:activate_pipeline)
+      subject.create_pipeline(pipeline_name, nil) do |pipeline_id|
+        "Pipeline ID: #{pipeline_id}"
+      end
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pipely
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Matt Gillooly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-16 00:00:00.000000000 Z
+date: 2015-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-graphviz