pipedream 0.4.5 → 0.4.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 3d9e2922f9c6667d76a0d7028ae49000536ab914662417e72d0f0fdf6cc7aea5
4
- data.tar.gz: 3e75a59671e7168f7d747f4a46db94f9f6756a0f0a925bd1ad1607ef8be3f733
3
+ metadata.gz: 9d161dba2b616b8ab983bde8ddd172c5ccd32c13c9cab76f4ddf921fa9636dea
4
+ data.tar.gz: 1810aae5887e61c4506fc1b6355b6b65582adb1f0357ab25a12520f0b666ffc3
5
5
  SHA512:
6
- metadata.gz: 28c61cb0f1dd55003854b179ffd26a153650b47558ac505e06c703624f453e3ee4bfb06ad40f4e5f0955245db3e37cb29430dd191ad416878c8fe40328077c06
7
- data.tar.gz: fe15a95759be6b95748850ddc95f49b330303585f60c847f5d50cd6398133a482e0d75d9293b5d098e7f78a1f45b2d02eecaffc92cd2eab4662d4ed2df6e0e5c
6
+ metadata.gz: aefb74f8043afcd93241910080741556cc7fa7ff10d413e8d224300cdb0eda9b592d1e454c8733da99d14573e177d216258555efcf256da117b0410374fb1409
7
+ data.tar.gz: 72c69e745910403a08585f0c672c26e39d0669b24280941c7f29dd0ba6bc53894d98cb32a208d46ef2c795fce1af87c0932df92c0f6af6c76637ff0c3ac40868
data/CHANGELOG.md CHANGED
@@ -3,6 +3,10 @@
3
3
  All notable changes to this project will be documented in this file.
4
4
  This project *loosely* adheres to [Semantic Versioning](http://semver.org/), even before v1.0.
5
5
 
6
+ ## [0.4.6] - 2021-12-29
7
+ - [#4](https://github.com/boltops-tools/pipedream/pull/4) fix activesupport require
8
+ - fix settings merge
9
+
6
10
  ## [0.4.5]
7
11
  - add aws codepipeline get-pipeline-state command hint in output also
8
12
  - dont autocamelize code build project name
@@ -44,7 +44,8 @@ module Pipedream::AwsServices
44
44
  #
45
45
  def inferred_stack_name(pipeline_name)
46
46
  items = [pipeline_name, @options[:type], Pipedream.env_extra, "pipe"]
47
- items.insert(2, Pipedream.env) if Pipedream.settings.dig(:stack_naming, :append_env)
47
+ append_env = Pipedream.settings.dig(:stack_naming, :append_env)
48
+ items.insert(2, Pipedream.env) if append_env
48
49
  items.reject(&:blank?).compact.join("-")
49
50
  end
50
51
 
@@ -25,7 +25,11 @@ module Pipedream
25
25
 
26
26
  all_envs = default.deep_merge(user.deep_merge(project))
27
27
  all_envs = merge_base(all_envs)
28
- data = all_envs[pipe_env] || all_envs["base"] || {}
28
+
29
+ env_data = all_envs[pipe_env] || {}
30
+ base_data = all_envs["base"] || {}
31
+ data = base_data.merge(env_data)
32
+
29
33
  data.deep_symbolize_keys
30
34
  end
31
35
  memoize :data
@@ -76,7 +80,7 @@ module Pipedream
76
80
  end
77
81
 
78
82
  def cb_root
79
- ENV["CODEPIPELINE_ROOT"] || Dir.pwd
83
+ ENV["PIPE_ROOT"] || Dir.pwd
80
84
  end
81
85
  end
82
86
  end
@@ -1,3 +1,3 @@
1
1
  module Pipedream
2
- VERSION = "0.4.5"
2
+ VERSION = "0.4.6"
3
3
  end
data/lib/pipedream.rb CHANGED
@@ -2,6 +2,7 @@ $:.unshift(File.expand_path("../", __FILE__))
2
2
  require "pipedream/version"
3
3
  require "rainbow/ext/string"
4
4
  require "memoist"
5
+ require "active_support"
5
6
  require "active_support/core_ext/hash"
6
7
 
7
8
  require "pipedream/autoloader"
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: pipedream
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.5
4
+ version: 0.4.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - Tung Nguyen
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2020-06-05 00:00:00.000000000 Z
11
+ date: 2021-12-29 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activesupport
@@ -379,7 +379,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
379
379
  - !ruby/object:Gem::Version
380
380
  version: '0'
381
381
  requirements: []
382
- rubygems_version: 3.1.2
382
+ rubygems_version: 3.2.32
383
383
  signing_key:
384
384
  specification_version: 4
385
385
  summary: A beautiful and powerful DSL to create and manage AWS CodePipeline pipelines