pipedream 0.4.3 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a955b6a15876413b9ae3788a8b99fdfe1d34e615fb530dc4c6d5d200bd9eeed
-  data.tar.gz: 0503d2c439697f7546afb678c293df90b53a36b6478d27170e9bcbbb2d898254
+  metadata.gz: f0a2c188404c51d550c70927ebaea42cf50c1ce88e7c227c0b77e9b47a2d4627
+  data.tar.gz: 649e237922e45576283dc4fd0bfd21095a22f547db8efb1f79a1a68c43ca6c6e
 SHA512:
-  metadata.gz: eb726218c6865adeaced56d28b53a62b0bf2dc126af83e017a175cf0daf05ef9e0bc2567fb0e3289a1349faa81df45a324f7c581fc8442041da72a486b865702
-  data.tar.gz: ec3e61313f3e1754a70e3b7c67eee5f172f6c9f26b8aaea01e137b6927a83a72d64ee8a7a75af3d4e94f828c2daf858c26fd5a4f69deb36c34ab1ffce39ad587
+  metadata.gz: c6ea79d68551285fd993784daaa300b895fae41f78de44c6ed91c6f35ef6201410d603fbcdb5e6ab22514d5863d7927ce19f49275fa0870be40a7824a2905c09
+  data.tar.gz: 20104cc2c78c9063747f5181fe1bdf6872b56b462c043698581099802f0cf130fc389db4c5268be9a86054eb18805702a1ca5f0e5fe409f8b7687153de7e1543

data/.gitignore

@@ -14,3 +14,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+Gemfile.lock

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.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
 
 ## [0.4.3]
 - fix pipedream renaming

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/aws_services.rb

@@ -1,6 +1,8 @@
 require "aws-sdk-codepipeline"
 require "aws-sdk-cloudformation"
 
+require "aws_mfa_secure/ext/aws" # add MFA support
+
 module Pipedream
   module AwsServices
     include Helpers

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

@@ -17,10 +17,10 @@ module Pipedream::Dsl::Pipeline
 
       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

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.3"
+  VERSION = "0.4.7"
 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

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "activesupport"
+  spec.add_dependency "aws-mfa-secure"
   spec.add_dependency "aws-sdk-cloudformation"
   spec.add_dependency "aws-sdk-codepipeline"
   spec.add_dependency "aws-sdk-s3"
@@ -31,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.3
+  version: 0.4.7
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-08 00:00:00.000000000 Z
+date: 2021-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: aws-mfa-secure
+  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: aws-sdk-cloudformation
   requirement: !ruby/object:Gem::Requirement
@@ -136,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
@@ -250,7 +278,6 @@ files:
 - ".rspec"
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - Guardfile
 - LICENSE.txt
 - README.md
@@ -366,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

data/Gemfile.lock

@@ -1,112 +0,0 @@
-PATH
-  remote: .
-  specs:
-    pipedream (0.4.2)
-      activesupport
-      aws-sdk-cloudformation
-      aws-sdk-codepipeline
-      aws-sdk-s3
-      aws-sdk-ssm
-      cfn_camelizer
-      memoist
-      rainbow
-      render_me_pretty
-      thor
-      zeitwerk
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (6.0.0)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.1, >= 2.1.8)
-    aws-eventstream (1.0.3)
-    aws-partitions (1.220.0)
-    aws-sdk-cloudformation (1.25.0)
-      aws-sdk-core (~> 3, >= 3.61.1)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-codepipeline (1.25.0)
-      aws-sdk-core (~> 3, >= 3.61.1)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-core (3.68.0)
-      aws-eventstream (~> 1.0, >= 1.0.2)
-      aws-partitions (~> 1.0)
-      aws-sigv4 (~> 1.1)
-      jmespath (~> 1.0)
-    aws-sdk-kms (1.24.0)
-      aws-sdk-core (~> 3, >= 3.61.1)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.48.0)
-      aws-sdk-core (~> 3, >= 3.61.1)
-      aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-ssm (1.56.0)
-      aws-sdk-core (~> 3, >= 3.61.1)
-      aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.1.0)
-      aws-eventstream (~> 1.0, >= 1.0.2)
-    byebug (11.0.1)
-    cfn_camelizer (0.4.0)
-      activesupport
-      memoist
-      rainbow
-    cli_markdown (0.1.0)
-    codeclimate-test-reporter (1.0.9)
-      simplecov (<= 0.13)
-    concurrent-ruby (1.1.5)
-    diff-lcs (1.3)
-    docile (1.1.5)
-    i18n (1.6.0)
-      concurrent-ruby (~> 1.0)
-    jmespath (1.4.0)
-    json (2.2.0)
-    memoist (0.16.0)
-    minitest (5.12.2)
-    rainbow (3.0.0)
-    rake (13.0.0)
-    render_me_pretty (0.8.3)
-      activesupport
-      rainbow
-      tilt
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.2)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.4)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.3)
-    simplecov (0.13.0)
-      docile (~> 1.1.0)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    thor (0.20.3)
-    thread_safe (0.3.6)
-    tilt (2.0.10)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    zeitwerk (2.1.10)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler
-  byebug
-  cli_markdown
-  codeclimate-test-reporter
-  pipedream!
-  rake
-  rspec
-
-BUNDLED WITH
-   2.0.2