pipedream 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d9e2922f9c6667d76a0d7028ae49000536ab914662417e72d0f0fdf6cc7aea5
-  data.tar.gz: 3e75a59671e7168f7d747f4a46db94f9f6756a0f0a925bd1ad1607ef8be3f733
+  metadata.gz: 9d161dba2b616b8ab983bde8ddd172c5ccd32c13c9cab76f4ddf921fa9636dea
+  data.tar.gz: 1810aae5887e61c4506fc1b6355b6b65582adb1f0357ab25a12520f0b666ffc3
 SHA512:
-  metadata.gz: 28c61cb0f1dd55003854b179ffd26a153650b47558ac505e06c703624f453e3ee4bfb06ad40f4e5f0955245db3e37cb29430dd191ad416878c8fe40328077c06
-  data.tar.gz: fe15a95759be6b95748850ddc95f49b330303585f60c847f5d50cd6398133a482e0d75d9293b5d098e7f78a1f45b2d02eecaffc92cd2eab4662d4ed2df6e0e5c
+  metadata.gz: aefb74f8043afcd93241910080741556cc7fa7ff10d413e8d224300cdb0eda9b592d1e454c8733da99d14573e177d216258555efcf256da117b0410374fb1409
+  data.tar.gz: 72c69e745910403a08585f0c672c26e39d0669b24280941c7f29dd0ba6bc53894d98cb32a208d46ef2c795fce1af87c0932df92c0f6af6c76637ff0c3ac40868

data/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 This project *loosely* adheres to [Semantic Versioning](http://semver.org/), even before v1.0.
 
+## [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

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

@@ -1,3 +1,3 @@
 module Pipedream
-  VERSION = "0.4.5"
+  VERSION = "0.4.6"
 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"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pipedream
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-05 00:00:00.000000000 Z
+date: 2021-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -379,7 +379,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
 summary: A beautiful and powerful DSL to create and manage AWS CodePipeline pipelines