pipedream 0.4.0 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5b217e3b797c3eac2f721a6637b1997e218222a6d316417c620e05145c1bfe6
-  data.tar.gz: '094476da993744df62614378996cc12481c911f6e39dc8a89a1baeee4030475d'
+  metadata.gz: 3d9e2922f9c6667d76a0d7028ae49000536ab914662417e72d0f0fdf6cc7aea5
+  data.tar.gz: 3e75a59671e7168f7d747f4a46db94f9f6756a0f0a925bd1ad1607ef8be3f733
 SHA512:
-  metadata.gz: 55404fd9abf77988a759c6b8d51a0b9dd64299ec12a03cda6836900b7cba5c11937fcd359bbeb14dd335b7fe4b30b77dfed9cd471669f5c7d376eb8e1f4055c5
-  data.tar.gz: f40b5c333e86b9b662f7863ef803dddd6737c7896931930305ebe638eff0643666737ff4f0001acf3d69f481cd0ac949be6df05f312dc884a621066d1057c653
+  metadata.gz: 28c61cb0f1dd55003854b179ffd26a153650b47558ac505e06c703624f453e3ee4bfb06ad40f4e5f0955245db3e37cb29430dd191ad416878c8fe40328077c06
+  data.tar.gz: fe15a95759be6b95748850ddc95f49b330303585f60c847f5d50cd6398133a482e0d75d9293b5d098e7f78a1f45b2d02eecaffc92cd2eab4662d4ed2df6e0e5c

data/.gitignore

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

data/CHANGELOG.md

@@ -1,7 +1,24 @@
 # 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.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
+
+## [0.4.2]
+- fix project_name
+
+## [0.4.1]
+- remove codebuild_prefix and codebuild_suffix helpers
 
 ## [0.4.0]
 - rename to pipedream

data/README.md

@@ -1,8 +1,14 @@
-# Pipedreamline
+<div align="center">
+  <a href="http://pipedream.run"><img src="https://raw.githubusercontent.com/tongueroo/pipedream/master/docs/img/logos/pipedream-with-text.png" /></a>
+</div>
+
+# Pipe Dream
 
 ![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.
@@ -28,7 +34,7 @@ First, run `pipe init` to generate a starter `.pipedream` folder structure.
 File | Description
 --- | ---
 pipeline.rb | The CodePipeline pipeline written as a DSL.  This is required. Here are the [Pipeline DSL docs](https://pipedream.run/docs/dsl/pipeline/)
-schedule.rb | A CloudWatch scheduled event written as a DSL. Here are the [schedule.rb docs](https://pipedream.run/docs/dsl/schedule/)
+schedule.rb | A CloudWatch scheduled event written as a DSL. Here are the [Schedule DSL docs](https://pipedream.run/docs/dsl/schedule/)
 
 ## DSL
 

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

@@ -45,12 +45,12 @@ module Pipedream
     end
     memoize :settings
 
-    def check_codepipeline_project!
+    def check_pipedream_project!
       check_path = "#{Pipedream.root}/.pipedream"
       unless File.exist?(check_path)
-        puts "ERROR: No .pipedream folder found.  Are you sure you are in a project with codepipeline setup?".color(:red)
+        puts "ERROR: No .pipedream folder found.  Are you sure you are in a project with pipedream setup?".color(:red)
         puts "Current directory: #{Dir.pwd}"
-        puts "If you want to set up codepipeline for this prjoect, please create a settings file via: codepipeline init"
+        puts "If you want to set up pipedream for this prjoect, please create a settings file via: pipe init"
         exit 1 unless ENV['TEST']
       end
     end

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

@@ -17,18 +17,16 @@ module Pipedream::Dsl::Pipeline
 
       actions = projects.map do |item|
         if item.is_a?(String)
-          name = item.underscore.camelize
-          project_name = adjusted_project_name(item) # add prefix and suffix
+          name = item
           default.deep_merge(
             name: name,
-            configuration: { project_name: project_name },
+            configuration: { project_name: item },
           )
         else # Hash
-          # With the hash, the user needs to set: name and configuration.project_name
-
-          # Handy shorthands
-          # The project name will allow this syntax
+          # With the hash notation, user needs to set: name and project_name
+          #
           #   codebuild(name: "action-name", project_name: "codebuild-project-names")
+          #
           project_name = item.delete(:project_name)
           if project_name
             item[:configuration] = { project_name: project_name }
@@ -40,18 +38,5 @@ module Pipedream::Dsl::Pipeline
 
       action(*actions)
     end
-
-    def codebuild_prefix(v)
-      @codebuild_prefix = v
-    end
-
-    def codebuild_suffix(v)
-      @codebuild_suffix = v
-    end
-
-  private
-    def adjusted_project_name(name)
-      [@codebuild_prefix, name, @codebuild_suffix].compact.join
-    end
   end
 end

data/lib/pipedream/evaluate.rb

@@ -40,7 +40,7 @@ module Pipedream
       end
     end
 
-    def lookup_codepipeline_file(name)
+    def lookup_pipedream_file(name)
       [".pipedream", @options[:type], name].compact.join("/")
     end
   end

data/lib/pipedream/init.rb

@@ -32,7 +32,7 @@ module Pipedream
     end
 
     def copy_project
-      puts "Initialize codepipeline project in .pipedream"
+      puts "Initialize pipedream project in .pipedream"
 
       excludes = %w[.git]
       if @options[:mode] == "light"

data/lib/pipedream/pipeline.rb

@@ -55,7 +55,7 @@ module Pipedream
 
   private
     def get_pipeline_path
-      lookup_codepipeline_file "pipeline.rb"
+      lookup_pipedream_file "pipeline.rb"
     end
   end
 end

data/lib/pipedream/role.rb

@@ -38,7 +38,7 @@ module Pipedream
 
   private
     def get_role_path
-      lookup_codepipeline_file("role.rb")
+      lookup_pipedream_file("role.rb")
     end
 
     def default_properties

data/lib/pipedream/schedule.rb

@@ -61,7 +61,7 @@ module Pipedream
 
   private
     def get_schedule_path
-      lookup_codepipeline_file("schedule.rb")
+      lookup_pipedream_file("schedule.rb")
     end
 
     def events_rule_role

data/lib/pipedream/setting.rb

@@ -4,14 +4,14 @@ require 'render_me_pretty'
 module Pipedream
   class Setting
     extend Memoist
-    def initialize(check_codepipeline_project=true)
-      @check_codepipeline_project = check_codepipeline_project
+    def initialize(check_pipedream_project=true)
+      @check_pipedream_project = check_pipedream_project
     end
 
     # data contains the settings.yml config.  The order or precedence for settings
     # is the project ufo/settings.yml and then the ~/.pipedream/settings.yml.
     def data
-      Pipedream.check_codepipeline_project! if @check_codepipeline_project
+      Pipedream.check_pipedream_project! if @check_pipedream_project
       return {} unless File.exist?(project_settings_path)
 
       # project based settings files

data/lib/pipedream/sns.rb

@@ -37,7 +37,7 @@ module Pipedream
 
   private
     def get_sns_path
-      lookup_codepipeline_file("sns.rb")
+      lookup_pipedream_file("sns.rb")
     end
   end
 end

data/lib/pipedream/start.rb

@@ -54,9 +54,9 @@ module Pipedream
         resource = resp.stack_resources.find do |r|
           r.logical_resource_id == "CodePipeline"
         end
-        resource.physical_resource_id # codepipeline project name
+        resource.physical_resource_id # pipeline name
       else
-        puts "ERROR: Unable to find the codepipeline project with either full_pipeline_name: #{@full_pipeline_name} or stack name: #{@stack_name}".color(:red)
+        puts "ERROR: Unable to find the pipeline with either full_pipeline_name: #{@full_pipeline_name} or stack name: #{@stack_name}".color(:red)
         exit 1
       end
     end
@@ -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.0"
+  VERSION = "0.4.5"
 end

data/lib/pipedream/webhook.rb

@@ -54,7 +54,7 @@ module Pipedream
   private
 
     def get_webhook_path
-      lookup_codepipeline_file("webhook.rb")
+      lookup_pipedream_file("webhook.rb")
     end
   end
 end

data/lib/template/.pipedream/README.md

@@ -0,0 +1,25 @@
+# Pipedream Files
+
+The files in folder are used by pipedream to build AWS CodePipeline pipelines.  For more info, check out the [pipedream docs](https://pipedream.run). Here's a quick start.
+
+## Install Tool
+
+    gem install pipedream
+
+This installs both the `pipe` and `pipedream` commands. They do the same thing, the `pipe` command is just shorter to type.
+
+## Update Project
+
+To update the CodePipeline pipelines:
+
+    pipedream deploy demo
+
+## Start a Execution
+
+To start a CodePipeline execution:
+
+    pipedream start demo
+
+To specify a branch:
+
+    pipedream start demo -b feature

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"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pipedream
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.5
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-02 00:00:00.000000000 Z
+date: 2020-06-05 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
@@ -250,7 +264,6 @@ files:
 - ".rspec"
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - Guardfile
 - LICENSE.txt
 - README.md
@@ -299,6 +312,7 @@ files:
 - lib/pipedream/update.rb
 - lib/pipedream/version.rb
 - lib/pipedream/webhook.rb
+- lib/template/.pipedream/README.md
 - lib/template/.pipedream/pipeline.rb.tt
 - lib/template/.pipedream/schedule.rb
 - lib/template/.pipedream/settings.yml
@@ -365,7 +379,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 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.3.3)
-      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.2)
-    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