pipedream 0.4.4 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 348fa6b7f61dbe11f858724464a10c59f0a42c0c9560cd96afcf7d1ee10b6855
-  data.tar.gz: 2e76a84f3f61bdc2b21c7c59e0796fe6e9d36057ba82050bd3afccd469dea387
+  metadata.gz: 9512b3e0690a2fdd0ef58cee7be1b6229851969b1a338bb85f0a6d882c491095
+  data.tar.gz: be61616a96fd760be544d1a6b45df2f6a0cb3fe8b1d9a7bafe37e551d5e226a3
 SHA512:
-  metadata.gz: f0ce62ec029718c4d7e4c1223b6d61a169d65b2b3cbc25df9d6212d4613bf669b2fb698c9073b2b3e8bed35578cca4fd1b6c0744e91dc4d00238b328a7b2971d
-  data.tar.gz: 3a3565ac89762d33e1f22b137825f01e70db243fcda68b75707f8ae5034aef4e25fe3a531fa536c9c31606b57950ddb342c217acdb1fb68b7867f841cac80f69
+  metadata.gz: f7627fec4faca9f46c264f6446686c074a6ec41b1f5034fb309570033663d90652ef34f7792cd0d5196e58ad123ccb56630eb130ef30246f341cf1b79f2025fe
+  data.tar.gz: 0fdc73a1ad168ce76c793bd3e23e277a27450f843704680faa9bab3a2f31a320e86948197dab252a257fb4f41d36bed64625142ed824c8a0ed55d3ea8372d4e3

data/CHANGELOG.md

@@ -1,7 +1,22 @@
 # Change Log
 
 All notable changes to this project will be documented in this file.
-This project *tries* to adhere to [Semantic Versioning](http://semver.org/), even before v1.0.
+This project *loosely* adheres to [Semantic Versioning](http://semver.org/), even before v1.0.
+
+## [0.4.8] - 2022-01-07
+- [#5](https://github.com/boltops-tools/pipedream/pull/5) improvements for multiple sources and in_parallel method
+
+## [0.4.7] - 2021-12-29
+- add rexml dependency
+
+## [0.4.6] - 2021-12-29
+- [#4](https://github.com/boltops-tools/pipedream/pull/4) fix activesupport require
+- fix settings merge
+
+## [0.4.5]
+- add aws codepipeline get-pipeline-state command hint in output also
+- dont autocamelize code build project name
+- #3 fix typo
 
 ## [0.4.4]
 - add mfa support for normal IAM user

data/README.md

@@ -7,6 +7,8 @@
 ![Build Status](https://codebuild.us-west-2.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoiWk1FM0dldzE5MUM5R3VqVGxxTmRFb1JGNnkxQjJpTDYvajYrQk91YzErNjdNc1VYVElHM3V5ZEJXcStyMmZVc210WG8vUURSV2JST0ZpSWc5Y0pYR3k0PSIsIml2UGFyYW1ldGVyU3BlYyI6IldvYXhLMU8yS2pQdVRKbEoiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=master)
 [![Gem Version](https://badge.fury.io/rb/pipedream.png)](http://badge.fury.io/rb/pipedream)
 
+[![BoltOps Badge](https://img.boltops.com/boltops/badges/boltops-badge.png)](https://www.boltops.com)
+
 Pipe Dream provides a DSL to make it easy create a CodePipeline pipeline.
 
 Pipe Dream installs `pipedream` and `pipe` executables. Both of them do the same thing, `pipe` is just shorter to type.

data/lib/pipedream/aws_services/helpers.rb

@@ -44,7 +44,8 @@ module Pipedream::AwsServices
     #
     def inferred_stack_name(pipeline_name)
       items = [pipeline_name, @options[:type], Pipedream.env_extra, "pipe"]
-      items.insert(2, Pipedream.env) if Pipedream.settings.dig(:stack_naming, :append_env)
+      append_env = Pipedream.settings.dig(:stack_naming, :append_env)
+      items.insert(2, Pipedream.env) if append_env
       items.reject(&:blank?).compact.join("-")
     end
 

data/lib/pipedream/build.rb

@@ -5,7 +5,6 @@ module Pipedream
     end
 
     def run
-      puts "build"
       options = @options
       Pipeline.new(options).run
     end

data/lib/pipedream/dsl/pipeline/codebuild.rb

@@ -12,15 +12,15 @@ module Pipedream::Dsl::Pipeline
         run_order: @run_order,
         # configuration: { project_name: '' }, # will be set
         # output_artifacts: [name: "BuildArtifact#{name}"], # TODO: maybe make this configurable with a setting
-        input_artifacts: [name: "SourceArtifact"],
+        input_artifacts: [name: "MainArtifact"],
       }
 
       actions = projects.map do |item|
         if item.is_a?(String)
-          name = item.underscore.camelize
+          name = item
           default.deep_merge(
             name: name,
-            configuration: { project_name: name },
+            configuration: { project_name: item },
           )
         else # Hash
           # With the hash notation, user needs to set: name and project_name
@@ -32,6 +32,7 @@ module Pipedream::Dsl::Pipeline
             item[:configuration] = { project_name: project_name }
           end
 
+          item[:name] ||= project_name
           item.reverse_merge(default)
         end
       end

data/lib/pipedream/dsl/pipeline/github.rb

@@ -13,8 +13,10 @@ module Pipedream::Dsl::Pipeline
       o_auth_token = props.delete(:auth_token)
       poll_for_source_changes = props.delete(:poll_for_source_changes) || "false"
 
+      source_name = props.delete(:source_name) || "Main"
+
       default = {
-        name: "Source",
+        name: source_name,
         action_type_id: {
           category: "Source",
           owner: "ThirdParty",
@@ -29,7 +31,7 @@ module Pipedream::Dsl::Pipeline
           poll_for_source_changes: poll_for_source_changes,
           repo: repo,
         },
-        output_artifacts: [name: "SourceArtifact"]
+        output_artifacts: [name: "#{source_name}Artifact"]
       }
       action(props.reverse_merge(default))
     end

data/lib/pipedream/dsl/pipeline.rb

@@ -9,6 +9,7 @@ module Pipedream::Dsl
       artifact_store
       artifact_stores
       disable_inboundstage_transitions
+      input_artifacts
       name
       restart_execution_on_update
       role_arn
@@ -20,6 +21,10 @@ module Pipedream::Dsl
       end
     end
 
+    def pipeline_name
+      @options[:pipeline_name]
+    end
+
     def stage(name, &block)
       # Reset values for each stage declaraion
       @run_order = 1
@@ -29,9 +34,15 @@ module Pipedream::Dsl
       block.call
     end
 
+    def in_parallel
+      @in_parallel = true
+      yield
+      @in_parallel = false
+    end
+
     def action(*props)
       @current_stage[:actions] += props
-      @run_order += 1
+      @run_order += 1 unless @in_parallel
     end
   end
 end

data/lib/pipedream/setting.rb

@@ -25,7 +25,11 @@ module Pipedream
 
       all_envs = default.deep_merge(user.deep_merge(project))
       all_envs = merge_base(all_envs)
-      data = all_envs[pipe_env] || all_envs["base"] || {}
+
+      env_data = all_envs[pipe_env] || {}
+      base_data = all_envs["base"] || {}
+      data = base_data.merge(env_data)
+
       data.deep_symbolize_keys
     end
     memoize :data
@@ -76,7 +80,7 @@ module Pipedream
     end
 
     def cb_root
-      ENV["CODEPIPELINE_ROOT"] || Dir.pwd
+      ENV["PIPE_ROOT"] || Dir.pwd
     end
   end
 end

data/lib/pipedream/start.rb

@@ -66,12 +66,15 @@ module Pipedream
     def codepipeline_info(execution_id)
       region = `aws configure get region`.strip rescue "us-east-1"
       url = "https://#{region}.console.aws.amazon.com/codesuite/codepipeline/pipelines/#{pipeline_name}/view"
-      cli = "aws codepipeline get-pipeline-execution --pipeline-execution-id #{execution_id} --pipeline-name #{pipeline_name}"
 
       puts "Pipeline started: #{pipeline_name}"
       puts "Please check the CodePipeline console for the status."
       puts "CodePipeline Console: #{url}"
-      puts "Pipeline cli: #{cli}"
+      puts "Pipeline cli commands:"
+      puts
+      puts "    aws codepipeline get-pipeline-execution --pipeline-execution-id #{execution_id} --pipeline-name #{pipeline_name}"
+      puts "    aws codepipeline get-pipeline-state --name #{pipeline_name}"
+      puts
     end
 
     def pipeline_exists?(name)

data/lib/pipedream/version.rb

@@ -1,3 +1,3 @@
 module Pipedream
-  VERSION = "0.4.4"
+  VERSION = "0.4.8"
 end

data/lib/pipedream.rb

@@ -2,6 +2,7 @@ $:.unshift(File.expand_path("../", __FILE__))
 require "pipedream/version"
 require "rainbow/ext/string"
 require "memoist"
+require "active_support"
 require "active_support/core_ext/hash"
 
 require "pipedream/autoloader"

data/lib/template/.pipedream/pipeline.rb.tt

@@ -6,7 +6,7 @@ stage "Source" do
   )
 end
 
-# IMPORANT: A valid pipeline requires at least 2 stages befre you are able to run
+# IMPORANT: A valid pipeline requires at least 2 stages before you are able to run
 #
 #     pipe deploy
 #

data/pipedream.gemspec

@@ -32,6 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "memoist"
   spec.add_dependency "rainbow"
   spec.add_dependency "render_me_pretty"
+  spec.add_dependency "rexml"
   spec.add_dependency "thor"
   spec.add_dependency "zeitwerk"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pipedream
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.8
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-10 00:00:00.000000000 Z
+date: 2022-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -150,6 +150,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -379,7 +393,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
 summary: A beautiful and powerful DSL to create and manage AWS CodePipeline pipelines