souyuz 0.7.2 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b64f8f3f0b47ac83077bade70b976957f9c3c8cd
-  data.tar.gz: c2de1d9f237a7fdfbad03beaedafe8e915b965c9
+SHA256:
+  metadata.gz: df17b3536e569b94853ca253515178b8237baa39bb4b8caecee89ec309beb068
+  data.tar.gz: 1a49c072ced2b71497e51dd5b2393cf73632f0e122a171ee2de78e65e8a43018
 SHA512:
-  metadata.gz: 680c049a707309caa92e76cc5eb8ee1940e4725855f371c3ac97b437c6c1b5f8d90a0e55d9288b880172826c06a8f363cbd426d36a41d669eb40d0e4223310b3
-  data.tar.gz: a3b0b09e13c0919182ea485822f7e46a83f608b4c9d43553024f5a228ba45b8fb4c7ec4de0d4c8dbe5e8172acd9ba9493b0840abf592928fe3c6e0a665dd73ba
+  metadata.gz: 2b7f8653ffab635f9a967cc88e7973af62081249a9a3c5f07d83d810ac91122ae2cd45fffca0f8fcc830902f6009968f339d035ab287395678080c94d65732b0
+  data.tar.gz: a1cb04c106f24ed6178b55bd3272d8516c9bba4af0e0903e52cc95c3fc32f47be8a5959dbc7dcab3b0057f8427a61917d8ce5b36232e0361cbaa9a299d8d8058

data/README.md

@@ -1,5 +1,7 @@
 # Souyuz
 
+[![Build Status](https://travis-ci.org/voydz/souyuz.svg?branch=master)](https://travis-ci.org/voydz/souyuz)
+
 A fastlane component to make Xamarin builds a breeze. Souyuz is now avaialbe as an **Fastlane plugin** see [fastlane-plugin-souyuz](fastlane-plugin-souyuz) for details.
 
 *NOTE: While souyuz should continue working with your existing configuration just fine, consider using the Fastlane plugin.*
@@ -25,4 +27,4 @@ souyuz(
 
 ## Licensing
 
-Souyuz is licensed under the MIT License. See [LICENSE](LICENSE) for the full license text.
+Souyuz is licensed under the MIT License. See [LICENSE](LICENSE) for the full license text.

data/bin/souyuz

@@ -3,4 +3,4 @@ $LOAD_PATH.push File.expand_path("../../lib", __FILE__)
 
 require "souyuz"
 require "souyuz/commands_generator"
-Souyuz::CommandsGenerator.start
+Souyuz::CommandsGenerator.start

data/lib/souyuz.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 require 'souyuz/version'
 require 'souyuz/platform'
 require 'souyuz/manager'

data/lib/souyuz/commands_generator.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 require "commander"
 require "fastlane"
 

data/lib/souyuz/detect_values.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 require 'nokogiri'
 
 module Souyuz
@@ -9,7 +8,7 @@ module Souyuz
     def self.set_additional_default_values
       config = Souyuz.config
 
-      # TODO detect_platform automatically for :platform config
+      # TODO: detect_platform automatically for :platform config
 
       # set correct implicit build platform for android
       if config[:platform] == Platform::ANDROID
@@ -35,16 +34,8 @@ module Souyuz
 
     def self.detect_solution
       return if Souyuz.config[:solution_path]
-      itr = 0
-      query = '*.sln'
-
-      begin
-         files = Dir.glob(query)
-         query = "../#{query}"
-         itr += 1
-      end until files.any? or itr > 3
 
-      sln = files.first # pick first file as solution
+      sln = find_file('*.sln', 3) # search for solution
       UI.user_error! 'Not able to find solution file automatically, try to specify it via `solution_path` parameter.' unless sln
 
       Souyuz.config[:solution_path] = abs_path sln
@@ -55,7 +46,7 @@ module Souyuz
 
       path = Souyuz.config[:solution_path]
       projects = Msbuild::SolutionParser.parse(path)
-        .get_platform Souyuz.config[:platform]
+                                        .get_platform Souyuz.config[:platform]
 
       UI.user_error! "Not able to find any project in solution, that matches the platform `#{Souyuz.config[:platform]}`." unless projects.any?
 
@@ -89,16 +80,8 @@ module Souyuz
 
     def self.detect_info_plist
       return if Souyuz.config[:plist_path] or Souyuz.config[:platform] != Platform::IOS
-      itr = 0
-      query = '../Info.plist'
 
-      begin
-         files = Dir.glob(query)
-         query = "*/#{query}"
-         itr += 1
-      end until files.any? or itr > 1
-
-      plist_path = files.first # pick first file as solution
+      plist_path = find_file('Info.plist', 1) # search for plist
       UI.user_error! 'Not able to find Info.plist automatically, try to specify it via `plist_path` parameter.' unless plist_path
 
       Souyuz.config[:plist_path] = abs_project_path plist_path
@@ -107,7 +90,7 @@ module Souyuz
     def self.detect_assembly_name(doc_csproj)
       return if Souyuz.config[:assembly_name]
 
-      if [ Platform::IOS, Platform::OSX ].include? Souyuz.config[:platform]
+      if [Platform::IOS, Platform::OSX].include? Souyuz.config[:platform]
         Souyuz.config[:assembly_name] = doc_csproj.css('PropertyGroup > AssemblyName').text
       elsif Souyuz.config[:platform] == Platform::ANDROID
         doc = get_parser_handle Souyuz.config[:manifest_path] # explicitly for this call, no cache needed
@@ -115,11 +98,25 @@ module Souyuz
       end
     end
 
-    private
+    private_class_method
+
+    def self.find_file(query, depth)
+      itr = 0
+      files = []
+
+      loop do
+        files = Dir.glob(query)
+        query = "../#{query}"
+        itr += 1
+        break if files.any? or itr > depth
+      end
+
+      return files.first # pick first file
+    end
 
     def self.get_parser_handle(filename)
-      f = File::open(filename)
-      doc = Nokogiri::XML(f)   
+      f = File.open(filename)
+      doc = Nokogiri::XML(f)
       f.close
 
       return doc
@@ -143,5 +140,5 @@ module Souyuz
       path = File.expand_path(path) # absolute dir
       path
     end
-  end 
+  end
 end

data/lib/souyuz/generators/android_zipalign_command_generator.rb

@@ -1,12 +1,8 @@
-# -*- encoding : utf-8 -*-
 module Souyuz
   # Responsible for building the zipalign command
   class AndroidZipalignCommandGenerator
     class << self
       def generate
-        build_apk_path = Souyuz.cache[:build_apk_path]
-        aligned_apk = "#{build_apk_path}-signed"
-
         parts = prefix
         parts << zipalign_apk
         parts += options
@@ -18,6 +14,8 @@ module Souyuz
       end
 
       def detect_build_tools
+        UI.user_error! "Please ensure that the Android SDK is installed and the ANDROID_HOME variable is set correctly" unless ENV['ANDROID_HOME']
+
         # determine latest buildtool version
         buildtools = File.join(ENV['ANDROID_HOME'], 'build-tools')
         version = Dir.entries(buildtools).sort.last
@@ -35,8 +33,6 @@ module Souyuz
       end
 
       def options
-        config = Souyuz.config
-
         options = []
         options << "-v" if $verbose
         options << "-f"
@@ -46,7 +42,7 @@ module Souyuz
       end
 
       def prefix
-        ["set -o pipefail &&"]
+        [""]
       end
 
       def pipe

data/lib/souyuz/generators/build_command_generator.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 module Souyuz
   # Responsible for building the fully working build command
   class BuildCommandGenerator
@@ -15,7 +14,7 @@ module Souyuz
       end
 
       def prefix
-        ["set -o pipefail &&"]
+        [""]
       end
 
       def compiler_bin
@@ -27,9 +26,10 @@ module Souyuz
 
         options = []
         options << "/p:Configuration=#{config[:build_configuration]}" if config[:build_configuration]
+        options << config[:extra_build_options] if config[:extra_build_options]
         options << "/p:Platform=#{config[:build_platform]}" if Souyuz.project.ios? and config[:build_platform]
         options << "/p:BuildIpa=true" if Souyuz.project.ios?
-        if (config[:solution_path])
+        if config[:solution_path]
           solution_dir = File.dirname(config[:solution_path])
           options << "/p:SolutionDir=#{solution_dir}/"
         end

data/lib/souyuz/generators/java_sign_command_generator.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 module Souyuz
   # Responsible for building the jarsigner command
   class JavaSignCommandGenerator
@@ -18,7 +17,7 @@ module Souyuz
       end
 
       def prefix
-        ["set -o pipefail &&"]
+        [""]
       end
 
       def detect_jarsigner_executable

data/lib/souyuz/generators/zip_dsym_command_generator.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 module Souyuz
   # Responsible for building the zip dsym command
   class ZipDsymCommandGenerator
@@ -13,7 +12,7 @@ module Souyuz
       end
 
       def prefix
-        ["set -o pipefail &&"]
+        [""]
       end
 
       def detect_zip_executable

data/lib/souyuz/manager.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 require "fastlane"
 
 module Souyuz

data/lib/souyuz/msbuild/project.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 module Souyuz
   module Msbuild
     class Project
@@ -30,14 +29,14 @@ module Souyuz
 
       def is_platform?(platform)
         return case platform
-          when Souyuz::Platform::IOS 
+               when Souyuz::Platform::IOS
             then self.project_name.downcase.include? 'ios'
-          when Souyuz::Platform::OSX 
+               when Souyuz::Platform::OSX
             then self.project_name.downcase.include? 'mac'
-          when Souyuz::Platform::ANDROID 
+               when Souyuz::Platform::ANDROID
             then self.project_name.downcase.include? 'droid'
-          else false
-        end
+               else false
+               end
       end
     end
   end

data/lib/souyuz/msbuild/solution.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 module Souyuz
   module Msbuild
     class Solution

data/lib/souyuz/msbuild/solution_parser.rb

@@ -1,15 +1,14 @@
-# -*- encoding : utf-8 -*-
 module Souyuz
   module Msbuild
     class SolutionParser
       def self.parse(filename)
         solution = Solution.new
 
-        File::open(filename) do |f|
+        File.open(filename) do |f|
           f.read.split("\n").each do |line|
-            if line.start_with? "Project" 
+            if line.start_with? "Project"
               options = parse_line line
-              solution.add_project Project.new(options) #maybe we should not use the project class for this
+              solution.add_project Project.new(options) # maybe we should not use the project class for this
             end
           end
         end

data/lib/souyuz/options.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 require "fastlane"
 
 module Souyuz
@@ -25,8 +24,12 @@ module Souyuz
         FastlaneCore::ConfigItem.new(key: :build_target,
                                      env_name: "SOUYUZ_BUILD_TARGET",
                                      description: "Build targets to build",
-                                     default_value: [ 'Build' ],
+                                     default_value: ['Build'],
                                      type: Array),
+        FastlaneCore::ConfigItem.new(key: :extra_build_options,
+                                     env_name: "SOUYUZ_EXTRA_BUILD_OPTIONS",
+                                     description: "Extra options to pass to `msbuild`. Example: `/p:MYOPTION=true`",
+                                     optional: true),
         FastlaneCore::ConfigItem.new(key: :output_path,
                                      env_name: "SOUYUZ_BUILD_OUTPUT_PATH",
                                      description: "Build output path",
@@ -75,7 +78,7 @@ module Souyuz
                                      default_value: 'http://timestamp.digicert.com',
                                      env_name: "SOUYUZ_ANDROID_KEYSTORE_TSA",
                                      description: "TSA for jarsigner",
-                                     optional: true),
+                                     optional: true)
       ]
     end
   end

data/lib/souyuz/platform.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 module Souyuz
   module Platform
     IOS = 'ios'

data/lib/souyuz/runner.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 require 'fastlane'
 
 module Souyuz
@@ -15,7 +14,7 @@ module Souyuz
         path
       elsif Souyuz.project.android?
         path = apk_file
-        if (config[:keystore_path] && config[:keystore_alias])
+        if config[:keystore_path] && config[:keystore_alias]
           UI.success "Jar it, sign it, zip it..."
 
           jarsign_and_zipalign
@@ -70,7 +69,7 @@ module Souyuz
       # in the upcomming switch we determin the output path of iOS ipa files
       # those change in the Xamarin.iOS Cycle 9 release
       # see https://developer.xamarin.com/releases/ios/xamarin.ios_10/xamarin.ios_10.4/
-      if File.exists? "#{build_path}/#{assembly_name}.ipa"
+      if File.exist? "#{build_path}/#{assembly_name}.ipa"
         # after Xamarin.iOS Cycle 9
         package_path = build_path
       else
@@ -92,13 +91,13 @@ module Souyuz
       assembly_name = Souyuz.project.options[:assembly_name]
 
       build_dsym_path = "#{build_path}/#{assembly_name}.app.dSYM"
-      if not File.exists? build_dsym_path
+      unless File.exist? build_dsym_path
         UI.success "Did not found dSYM at #{build_dsym_path}, skipping..."
         return
       end
 
       Souyuz.cache[:build_dsym_path] = build_dsym_path
-      
+
       command = ZipDsymCommandGenerator.generate
       FastlaneCore::CommandExecutor.execute(command: command,
                                             print_all: true,
@@ -106,7 +105,7 @@ module Souyuz
 
       # move dsym aside ipa
       dsym_path = "#{dsym_path}.zip"
-      if File.exists? dsym_path
+      if File.exist? dsym_path
         FileUtils.mv(dsym_path, "#{package_path}/#{File.basename dsym_path}")
       end
     end

data/lib/souyuz/version.rb

@@ -1,5 +1,5 @@
-# -*- encoding : utf-8 -*-
+
 module Souyuz
-  VERSION = "0.7.2"
+  VERSION = "0.8.1"
   DESCRIPTION = "A fastlane component to make Xamarin builds a breeze"
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: souyuz
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.1
 platform: ruby
 authors:
 - Felix Rudat
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-05 00:00:00.000000000 Z
+date: 2018-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: fastlane
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 2.29.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 2.29.0
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
-  name: fastlane
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.103.0
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.103.0
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -84,30 +84,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: magic_encoding
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.49.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.49.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -173,7 +159,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -181,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A fastlane component to make Xamarin builds a breeze