fastlane_env_lanes 0.1.2 → 0.1.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (3) hide show
  1. checksums.yaml +4 -4
  2. data/lib/fastlane_env_lanes.rb +10 -5
  3. metadata +4 -4
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 25f927573d1fab30214ba654066a74c504d7a751
4
- data.tar.gz: a31ee25d5e428d5fdd92ce9e677bc2d8caf0c175
3
+ metadata.gz: 47ee21e124fc3c4f2f7b662d9e3ebe68409bf775
4
+ data.tar.gz: 11490d6468c49b0dc17c39a071ede07e51560504
5
5
  SHA512:
6
- metadata.gz: ef0734ad7e262e670fc3cd7e235a0afc3210d15899e79ea9a03d10cdbb5da7023d196708513da97d24878a83692a05afb9417c6eddec4a776d039ad169560d8e
7
- data.tar.gz: 5a5b54e02123b9513b9c2de904e6cd04fefef85494740365544156441d2ad1a2b0676e8326f299115a1629a4d44795fdff92a4c98a4786fe3e052cc406859cf8
6
+ metadata.gz: 913dbb3af25f9994028c22a6be7b7f26cbf3831a61a15125c3438ee761fd7f2969b8af0ea3ca708bf8d4044c1368d97f52050c0578c82624f8cb7a0a268aa660
7
+ data.tar.gz: aaed93b6de1aa60bdfb8b2d5d2e9a6d159ef70432e7a7b32a8f350ed04362832d164184be56dd423e0cce1bbabcbdae0ab6f2725f83490cb45daecf1c98d8e61
@@ -19,9 +19,6 @@ module FastlaneEnvLanes
19
19
  module FastlaneRunnerExtensions
20
20
  def execute(key)
21
21
 
22
- # env = Fastlane::Actions.lane_context[ Fastlane::Actions::SharedValues::ENVIRONMENT ]
23
- # env_key = (key.to_s + '__' + env.to_s).to_sym if env
24
-
25
22
  env_key = key.to_s.gsub(':', '__')
26
23
  lane_key = env_key.split('__')[0]
27
24
 
@@ -30,16 +27,24 @@ module FastlaneEnvLanes
30
27
  env_default_file = File.join(Fastlane::FastlaneFolder.path || "", '.env.default')
31
28
  Dotenv.load(env_file, env_default_file)
32
29
 
33
- # Loads .env file for the environment passed in through options
30
+ # Priority of environment goes to lane called with ":<env>"
31
+ # Then uses environment passed in through options "--env <env>"
32
+ env = nil
34
33
  if env_key.split('__').size > 1
35
34
  env = env_key.split('__')[1]
35
+ else
36
+ env = Fastlane::Actions.lane_context[ Fastlane::Actions::SharedValues::ENVIRONMENT ].to_s
37
+ env_key = lane_key + '__' + env
38
+ end
36
39
 
40
+ # Loads .env file for the environment
41
+ if env
37
42
  env_file = File.join(Fastlane::FastlaneFolder.path || "", ".env.#{env}")
38
43
  Fastlane::Helper.log.info "Loading from '#{env_file}'".green
39
44
  Dotenv.overload(env_file)
40
45
  end
41
46
 
42
- # Better checking if the environment lane exists
47
+ # Checking if the environment lane exists
43
48
  if FastlaneEnvLanes.env_lanes && FastlaneEnvLanes.env_lanes.include?(env_key.to_sym)
44
49
  super env_key.to_sym
45
50
  else
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: fastlane_env_lanes
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.2
4
+ version: 0.1.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Josh Holtz
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-02-17 00:00:00.000000000 Z
11
+ date: 2015-03-10 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: fastlane
@@ -16,14 +16,14 @@ dependencies:
16
16
  requirements:
17
17
  - - ~>
18
18
  - !ruby/object:Gem::Version
19
- version: 0.1.7
19
+ version: '0.2'
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - ~>
25
25
  - !ruby/object:Gem::Version
26
- version: 0.1.7
26
+ version: '0.2'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: dotenv
29
29
  requirement: !ruby/object:Gem::Requirement