fastlane_env_lanes 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47ee21e124fc3c4f2f7b662d9e3ebe68409bf775
-  data.tar.gz: 11490d6468c49b0dc17c39a071ede07e51560504
+  metadata.gz: ebd43b7fc53ef0a0036f6ab2bf52a5186708f5c9
+  data.tar.gz: 45657aaf1066a855aae776008d6d4f6de52f1226
 SHA512:
-  metadata.gz: 913dbb3af25f9994028c22a6be7b7f26cbf3831a61a15125c3438ee761fd7f2969b8af0ea3ca708bf8d4044c1368d97f52050c0578c82624f8cb7a0a268aa660
-  data.tar.gz: aaed93b6de1aa60bdfb8b2d5d2e9a6d159ef70432e7a7b32a8f350ed04362832d164184be56dd423e0cce1bbabcbdae0ab6f2725f83490cb45daecf1c98d8e61
+  metadata.gz: 9492428f6f489145afe214c408810c7168ba8e1452f08116a943866ff1ec4334a5c2faaadbef6d279f01439e36b09d32d0c73426d109c33fb7e9e4bc45dc6d54
+  data.tar.gz: 412acca80887de02c26050d30bd36fb2372fa1e4511b17acef587d55b453ed9a0ccb971696ea221a07006da36cb86c0b0157b899b90d4dd2f002c9487cf7033f

data/lib/fastlane_env_lanes.rb

@@ -15,9 +15,23 @@ module FastlaneEnvLanes
       super key, &block
     end
   end
+end
+
+module FastlaneLaneManagerExtensions
+
+  module ClassMethods
 
-  module FastlaneRunnerExtensions
-    def execute(key)
+    def cruise_lane(platform, key, p_env = nil)
+
+      keys = key.split(' ') 
+      keys.each do |single_key|
+        args = fl_env_lanes_run_lane(platform, single_key, p_env)
+        super(args[0], args[1], args[2])
+      end
+
+    end
+
+    def fl_env_lanes_run_lane(platform, key, p_env)
 
       env_key = key.to_s.gsub(':', '__')
       lane_key = env_key.split('__')[0]
@@ -28,13 +42,13 @@ module FastlaneEnvLanes
       Dotenv.load(env_file, env_default_file)
 
       # Priority of environment goes to lane called with ":<env>"
-      # Then uses environment passed in through options "--env <env>"
+      # Then uses environment passed in through options ":<env>"
       env = nil
       if env_key.split('__').size > 1
         env = env_key.split('__')[1]
-      else
-        env = Fastlane::Actions.lane_context[ Fastlane::Actions::SharedValues::ENVIRONMENT ].to_s
-        env_key = lane_key + '__' + env
+      elsif p_env
+        # env = Fastlane::Actions.lane_context[ Fastlane::Actions::SharedValues::ENVIRONMENT ].to_s unless p_env
+        env_key = lane_key + '__' + p_env
       end
 
       # Loads .env file for the environment
@@ -44,16 +58,26 @@ module FastlaneEnvLanes
         Dotenv.overload(env_file)
       end
 
+      env = p_env if p_env
+
       # Checking if the environment lane exists
-      if FastlaneEnvLanes.env_lanes && FastlaneEnvLanes.env_lanes.include?(env_key.to_sym)
-        super env_key.to_sym
+      if env_key
+        return platform, env_key.to_s, env
       else
-        super lane_key.to_sym
+        return platform, lane_key.to_s, env
       end
-
     end
+
+  end
+
+  def self.prepended(base)
+    class << base
+      prepend ClassMethods
+    end  
   end
+
 end
+Fastlane::LaneManager.send(:prepend, FastlaneLaneManagerExtensions)
 
 module Fastlane
   class FastFile
@@ -61,8 +85,3 @@ module Fastlane
   end
 end
 
-module Fastlane
-  class Runner
-    prepend FastlaneEnvLanes::FastlaneRunnerExtensions
-  end
-end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: fastlane_env_lanes
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Josh Holtz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-10 00:00:00.000000000 Z
+date: 2015-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastlane
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.12'
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
 description: Fastlane environment specific lanes (implemented a bit hacky)
@@ -55,12 +55,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []