fastlane_env_lanes 0.1.1 → 0.1.2

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 +41 -29
  3. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 90bd5376f20a300e150f1694eac8e099dbf1f100
4
- data.tar.gz: e459a48e7fe6a9fe0e7bb0db93f3b03ab83a48e7
3
+ metadata.gz: 25f927573d1fab30214ba654066a74c504d7a751
4
+ data.tar.gz: a31ee25d5e428d5fdd92ce9e677bc2d8caf0c175
5
5
  SHA512:
6
- metadata.gz: 134323d9739f6db4241fdcda9e6f40b6a7b86102dbe1b6705d87888d5ecc5674a265cb5fac4906881f6b41e2dc6331f2e852b486f25098f62311b7f66e5efc71
7
- data.tar.gz: 51a402da37480a12d7135572b6346dab5ab52b0a8522ee0e1fdf4748b9ac756eeb7729395eb540ac5d3b417792280c288d4c4deea670284167b06b71f6523da1
6
+ metadata.gz: ef0734ad7e262e670fc3cd7e235a0afc3210d15899e79ea9a03d10cdbb5da7023d196708513da97d24878a83692a05afb9417c6eddec4a776d039ad169560d8e
7
+ data.tar.gz: 5a5b54e02123b9513b9c2de904e6cd04fefef85494740365544156441d2ad1a2b0676e8326f299115a1629a4d44795fdff92a4c98a4786fe3e052cc406859cf8
@@ -1,51 +1,63 @@
1
1
  require 'dotenv'
2
2
 
3
- module FastlaneFastFileExtensions
4
- def lane(key, env=nil, &block)
5
- key = (key.to_s + '__' + env.to_s).to_sym if env
6
- super key, &block
3
+ module FastlaneEnvLanes
4
+
5
+ class << self; attr_accessor :env_lanes; end
6
+
7
+ module FastlaneFastFileExtensions
8
+ def lane(key, env=nil, &block)
9
+ key = (key.to_s + '__' + env.to_s).to_sym if env
10
+
11
+ # Stores the lanes that we know
12
+ FastlaneEnvLanes.env_lanes ||= []
13
+ FastlaneEnvLanes.env_lanes << key
14
+
15
+ super key, &block
16
+ end
7
17
  end
8
- end
9
18
 
10
- module FastlaneRunnerExtensions
11
- def execute(key)
19
+ module FastlaneRunnerExtensions
20
+ def execute(key)
12
21
 
13
- # env = Fastlane::Actions.lane_context[ Fastlane::Actions::SharedValues::ENVIRONMENT ]
14
- # env_key = (key.to_s + '__' + env.to_s).to_sym if env
15
-
16
- env_key = key.to_s.gsub(':', '__')
17
- lane_key = env_key.split('__')[0]
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
+ env_key = key.to_s.gsub(':', '__')
26
+ lane_key = env_key.split('__')[0]
18
27
 
19
- # Making sure the default '.env' and '.env.default' get loaded
20
- env_file = File.join(Fastlane::FastlaneFolder.path || "", '.env')
21
- env_default_file = File.join(Fastlane::FastlaneFolder.path || "", '.env.default')
22
- Dotenv.load(env_file, env_default_file)
28
+ # Making sure the default '.env' and '.env.default' get loaded
29
+ env_file = File.join(Fastlane::FastlaneFolder.path || "", '.env')
30
+ env_default_file = File.join(Fastlane::FastlaneFolder.path || "", '.env.default')
31
+ Dotenv.load(env_file, env_default_file)
23
32
 
24
- # Loads .env file for the environment passed in through options
25
- if env_key.split('__').size > 1
26
- env = env_key.split('__')[1]
33
+ # Loads .env file for the environment passed in through options
34
+ if env_key.split('__').size > 1
35
+ env = env_key.split('__')[1]
27
36
 
28
- env_file = File.join(Fastlane::FastlaneFolder.path || "", ".env.#{env}")
29
- Fastlane::Helper.log.info "Loading from '#{env_file}'".green
30
- Dotenv.overload(env_file)
31
- end
37
+ env_file = File.join(Fastlane::FastlaneFolder.path || "", ".env.#{env}")
38
+ Fastlane::Helper.log.info "Loading from '#{env_file}'".green
39
+ Dotenv.overload(env_file)
40
+ end
41
+
42
+ # Better checking if the environment lane exists
43
+ if FastlaneEnvLanes.env_lanes && FastlaneEnvLanes.env_lanes.include?(env_key.to_sym)
44
+ super env_key.to_sym
45
+ else
46
+ super lane_key.to_sym
47
+ end
32
48
 
33
- begin
34
- super env_key.to_sym
35
- rescue
36
- super lane_key.to_sym
37
49
  end
38
50
  end
39
51
  end
40
52
 
41
53
  module Fastlane
42
54
  class FastFile
43
- prepend FastlaneFastFileExtensions
55
+ prepend FastlaneEnvLanes::FastlaneFastFileExtensions
44
56
  end
45
57
  end
46
58
 
47
59
  module Fastlane
48
60
  class Runner
49
- prepend FastlaneRunnerExtensions
61
+ prepend FastlaneEnvLanes::FastlaneRunnerExtensions
50
62
  end
51
63
  end
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.1
4
+ version: 0.1.2
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-16 00:00:00.000000000 Z
11
+ date: 2015-02-17 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: fastlane