fastlane-plugin-elux_actions 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b2bea27f6c1e25ec9ccb70fedb0dcbc0f53628c
-  data.tar.gz: 9c15e99a336b5abde2fab97c1f962b14a97120ea
+  metadata.gz: 10d100d0c6f3423c3038b4487f9305c8a7abd1a7
+  data.tar.gz: 7e5f8ca6d75c6a32266176b57ba8adc769f87b81
 SHA512:
-  metadata.gz: 9185a8c5be65a58a4c12b293f76b15adae16f7668b33c8827a87904e4b4ea6f67e3bc04a57dcf6d65ddc9f9366fa72bca86639d943f32bef506db8abddebfb65
-  data.tar.gz: 4bb251810d5c8a927a1e7f76037174ec0ede8029147298479d467a58f287dc8a1988996efd61eb905eeccd6730fea518d89a0d56385fd44fe21ed0d5c481bdf4
+  metadata.gz: 9d8318d85ea71297085c8caa62197e79bdcc6837f70414fe06cdba90fd5660469a80ecf693b8142a0f983b1a31048059b797fb87036e0ba43d863a23ee7d9f15
+  data.tar.gz: 6137688a25e23c1238030b25621481daa85c463ce63faf3bfaa283279f8d33181732d5d93b3a27fe0a64c845b936fbb05d39a5cfce1007c2a8369100ace6b367

data/lib/fastlane/plugin/elux_actions/actions/increment_version_and_tag.rb

@@ -14,14 +14,11 @@ module Fastlane
         version = `#{cmd}`
         Actions.lane_context[SharedValues::NEW_VERSION] = version
         Actions.lane_context[SharedValues::NEW_VERSION_NUMBERS] = version.gsub(/[a-zA-Z]/, '')
-        version
 
         # Create the tag
         cmd = "git tag -a \"#{version}\" -m \"Version #{version}\""
         STDOUT.puts cmd
         STDOUT.flush
-        status = sh cmd
-
       end
 
       #####################################################

data/lib/fastlane/plugin/elux_actions/actions/{upload_to_nexus_3.rb → upload_to_nexus_3_action.rb}

@@ -1,35 +1,24 @@
 module Fastlane
   module Actions
-    module SharedValues
-      RELEASE_TO_NEXUS_CUSTOM_VALUE = :RELEASE_TO_NEXUS_CUSTOM_VALUE
-    end
-
     class UploadToNexus3Action < Action
       def self.run(params)
-        # fastlane will take care of reading in the parameter and fetching the environment variable:
-
-        classifier_str = "-#{params[:classifier]}" unless params[:classifier].empty?
-
-        path = params[:group_id].gsub(".", "/")
-
-        pom = [
-                "<project>",
-                "  <modelVersion>4.0.0</modelVersion>",
-                "  <groupId>#{params[:group_id]}</groupId>",
-                "  <artifactId>#{params[:artifact_id]}</artifactId>",
-                "  <version>#{params[:version]}</version>",
-                "</project>"
-              ].join("\n")
-        STDOUT.puts pom
-        STDOUT.flush
-
-        pomFile = Tempfile.new("pom.xml")
-        pomFile.write(pom)
-        pomFile.flush
-
-
-        sh "curl -v -u \"" + params[:nexus_user] + ":" + params[:nexus_password] + "\" --upload-file #{pomFile.path} #{params[:nexus_base_url]}/repository/#{params[:repository]}/#{path}/#{params[:artifact_id]}/#{params[:version]}/#{params[:artifact_id]}-#{params[:version]}#{classifier_str}.pom"
-        sh "curl -v -u \"" + params[:nexus_user] + ":" + params[:nexus_password] + "\" --upload-file #{params[:file]} #{params[:nexus_base_url]}/repository/#{params[:repository]}/#{path}/#{params[:artifact_id]}/#{params[:version]}/#{params[:artifact_id]}-#{params[:version]}#{classifier_str}.#{params[:type]}"
+        @group_id = params[:group_id]
+        @artifact_id = params[:artifact_id]
+        @version = params[:version]
+        @classifier = params[:classifier]
+        @nexus_base_url = params[:nexus_base_url]
+        @nexus_user = params[:nexus_user]
+        @repository = params[:repository]
+        @type = params[:type]
+
+        ENV['FASTLANE_NEXUS_PASSWORD'] = params[:nexus_password]
+
+        actions = [
+          "curl --fail -u \"#{credentials}\" --upload-file #{temp_pom_file} #{pom_url} #{verbose}",
+          "curl --fail -u \"#{credentials}\" --upload-file #{params[:file]} #{file_url} #{verbose}"
+        ].map(&:rstrip).join(' && ')
+
+        sh(actions)
       end
 
       #####################################################
@@ -84,18 +73,18 @@ module Fastlane
                                          UI.user_error!("Please provide group_id") unless value and !value.empty?
                                          # UI.user_error!("Couldn't find file at path '#{value}'") unless File.exist?(value)
                                        end),
-           FastlaneCore::ConfigItem.new(key: :type,
-                                         env_name: "type",
-                                         description: "The artefact types",
-                                         is_string: false,
-                                         default_value: ""),
-           FastlaneCore::ConfigItem.new(key: :version,
-                                        env_name: "version",
-                                        description: "The version of the artifact",
-                                        verify_block: proc do |value|
-                                          UI.user_error!("Please provide version") unless value and !value.empty?
-                                          # UI.user_error!("Couldn't find file at path '#{value}'") unless File.exist?(value)
-                                        end),
+          FastlaneCore::ConfigItem.new(key: :type,
+                                       env_name: "type",
+                                       description: "The artefact types",
+                                       is_string: false,
+                                       default_value: ""),
+          FastlaneCore::ConfigItem.new(key: :version,
+                                       env_name: "version",
+                                       description: "The version of the artifact",
+                                       verify_block: proc do |value|
+                                         UI.user_error!("Please provide version") unless value and !value.empty?
+                                         # UI.user_error!("Couldn't find file at path '#{value}'") unless File.exist?(value)
+                                       end),
           FastlaneCore::ConfigItem.new(key: :classifier,
                                        env_name: "classifier",
                                        description: "The classifier of the artifact",
@@ -136,16 +125,68 @@ module Fastlane
       end
 
       def self.is_supported?(platform)
-        # you can do things like
-        #
-        #  true
-        #
-        #  platform == :ios
-        #
-        #  [:ios, :mac].include?(platform)
-        #
-
-        platform == :ios
+        platform == :android
+      end
+
+      class << self
+        def verbose
+          "-v" if FastlaneCore::Globals.verbose?
+        end
+
+        def temp_pom_file
+          pom = [
+            "<project>",
+            "  <modelVersion>4.0.0</modelVersion>",
+            "  <groupId>#{@group_id}</groupId>",
+            "  <artifactId>#{@artifact_id}</artifactId>",
+            "  <version>#{@version}</version>",
+            classifier_tag,
+            "</project>"
+          ].compact.join("\n")
+
+          pom_file = Tempfile.new("pom.xml")
+          pom_file.write(pom)
+          pom_file.flush
+
+          return pom_file.path
+        end
+
+        def group_path
+          @group_id.gsub(".", "/")
+        end
+
+        def artifact_url
+          [
+            @nexus_base_url,
+            "repository",
+            @repository,
+            group_path,
+            @artifact_id,
+            @version
+          ].join("/")
+        end
+
+        def classifier
+          "-#{@classifier}" unless @classifier.empty?
+        end
+
+        def classifier_tag
+          "  <classifier>#{@classifier}</classifier>" unless @classifier.empty?
+        end
+
+        def file_url
+          file_name = "#{@artifact_id}-#{@version}#{classifier}.#{@type}"
+          [artifact_url, file_name].join("/")
+        end
+
+        def pom_url
+          pom_name = "#{@artifact_id}-#{@version}#{classifier}.pom"
+          [artifact_url, pom_name].join("/")
+        end
+
+        def credentials
+          "#{@nexus_user}:$FASTLANE_NEXUS_PASSWORD"
+        end
       end
     end
   end

data/lib/fastlane/plugin/elux_actions/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module EluxActions
-    VERSION = "1.2.2"
+    VERSION = "1.2.3"
   end
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-elux_actions
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Dennis Granath
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-04 00:00:00.000000000 Z
+date: 2017-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,21 +25,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: fastlane
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.28.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.28.4
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,19 +81,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: fastlane
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.28.4
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.28.4
+        version: '0'
 description: 
 email: dennis@diabol.se
 executables: []
@@ -105,7 +105,7 @@ files:
 - lib/fastlane/plugin/elux_actions.rb
 - lib/fastlane/plugin/elux_actions/actions/increment_version_and_tag.rb
 - lib/fastlane/plugin/elux_actions/actions/nexus_promote_action.rb
-- lib/fastlane/plugin/elux_actions/actions/upload_to_nexus_3.rb
+- lib/fastlane/plugin/elux_actions/actions/upload_to_nexus_3_action.rb
 - lib/fastlane/plugin/elux_actions/helper/elux_actions_helper.rb
 - lib/fastlane/plugin/elux_actions/version.rb
 homepage: 
@@ -128,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Plugin including actions for releasing the android SDK