souyuz 0.1.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 368484d22e8d6d287966ced20c877224071eb3f2
-  data.tar.gz: c3c8638ab220b8c3c46ed778c0f87b7552f5bb5c
+  metadata.gz: f064a8e18a28767b799724c537915ae95d4f71b8
+  data.tar.gz: fb930ec7fea16848078229a09f8479902c6440be
 SHA512:
-  metadata.gz: 0765c3c1902728fce692fb5ccf8512c09d68b4b7cc1609872598f1e15ca15c98501d03d81a24e10dad3e4a604a2b41da3a3e9af9295beb8ac1bcefae04430555
-  data.tar.gz: 26ccd09dc6b46e041f5e83679c880515c29e748b1c25e2a475c99f550e12e359102c3fbb213623f76759297dff77dd59b6e8cdca45d9f0353d6e05b3ba74d355
+  metadata.gz: aa52e4eb5153d475c293aede7bcbe0eaa5ab3aaac914d81b626ce99eab806b652727a6bfe4163f87a9d0a945290d434946dc46c0f59c64c94f6d0c82e0c43f96
+  data.tar.gz: 505cdf930681b4e4ff9027df29f20d3d601d2f1a13d1b905648687458bc34d3f1d970121624090ae7b4c7a5017ecb4612e14c7392b80fb46dba67a32dc93b91d

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 Felix Rudat
+Copyright (c) 2016-2017 Felix Rudat
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,11 +1,11 @@
 # Souyuz
 
-A fastlane component to make Xamarin builds a breeze.
+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.*
 
 ## ToDos
 
+* clean up code (!!!)
 * replace path concat with `File.join()`
-* automatically determine `:platform`
 
 ## Licensing
 

data/lib/souyuz/detect_values.rb

@@ -25,6 +25,7 @@ module Souyuz
 
       detect_output_path doc_csproj
       detect_manifest doc_csproj
+      detect_info_plist
       detect_assembly_name doc_csproj # we can only do that for android *after* we detected the android manitfest
 
       return config
@@ -73,7 +74,10 @@ module Souyuz
       platform = Souyuz.config[:build_platform]
 
       doc_node = doc_csproj.xpath("/*[local-name()='Project']/*[local-name()='PropertyGroup'][translate(@*[local-name() = 'Condition'],'ABCDEFGHIJKLMNOPQRSTUVWXYZ','abcdefghijklmnopqrstuvwxyz') = \" '$(configuration)|$(platform)' == '#{configuration.downcase}|#{platform.downcase}' \"]/*[local-name()='OutputPath']/text()")
-      Souyuz.config[:output_path] = abs_project_path doc_node.text
+      output_path = doc_node.text
+      UI.user_error! 'Not able to find output path automatically, try to specify it via `output_path` parameter.' unless output_path
+
+      Souyuz.config[:output_path] = abs_project_path output_path
     end
 
     def self.detect_manifest(doc_csproj)
@@ -83,10 +87,27 @@ module Souyuz
       Souyuz.config[:manifest_path] = abs_project_path doc_node.text
     end
 
+    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
+      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
+    end
+
     def self.detect_assembly_name(doc_csproj)
       return if Souyuz.config[:assembly_name]
 
-      if [ Platform::IOS, Platform::MAC ].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

data/lib/souyuz/generators/android_zipalign_command_generator.rb

@@ -1,17 +1,22 @@
 # -*- encoding : utf-8 -*-
 module Souyuz
   # Responsible for building the zipalign command
-  # TODO implement
   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
+        parts << Souyuz.cache[:signed_apk_path]
+        parts << Souyuz.cache[:build_apk_path]
         parts += pipe
 
         parts
       end
-      
+
       def detect_build_tools
         # determine latest buildtool version
         buildtools = File.join(ENV['ANDROID_HOME'], 'build-tools')
@@ -26,8 +31,18 @@ module Souyuz
         buildtools, version = detect_build_tools
         zipalign = ENV['ANDROID_HOME'] ? File.join(buildtools, version, 'zipalign') : 'zipalign'
 
-        sh "\"#{zipalign}\" -f -v 4 #{signed_apk} #{aligned_apk}"
-        Helper.backticks(command, print: !Souyuz.config[:silent])
+        zipalign
+      end
+
+      def options
+        config = Souyuz.config
+
+        options = []
+        options << "-v" if $verbose
+        options << "-f"
+        options << "4"
+
+        options
       end
 
       def prefix
@@ -36,7 +51,7 @@ module Souyuz
 
       def pipe
         pipe = []
- 
+
         pipe
       end
     end

data/lib/souyuz/generators/build_command_generator.rb

@@ -8,7 +8,7 @@ module Souyuz
         parts << "xbuild"
         parts += options
         parts += targets
-        parts << project
+        parts += project
         parts += pipe
 
         parts
@@ -42,15 +42,17 @@ module Souyuz
       end
 
       def project
-        config = Souyuz.config
+        path = []
+
+        path << Souyuz.config[:project_path] if Souyuz.project.android?
+        path << Souyuz.config[:solution_path] if Souyuz.project.ios? or Souyuz.project.osx?
 
-        Souyuz.config[:project_path] if Souyuz.project.android?
-        Souyuz.config[:solution_path] if Souyuz.project.ios? or Souyuz.project.mac?
+        path
       end
 
       def pipe
         pipe = []
- 
+
         pipe
       end
     end

data/lib/souyuz/generators/java_sign_command_generator.rb

@@ -1,12 +1,11 @@
 # -*- encoding : utf-8 -*-
 module Souyuz
   # Responsible for building the jarsigner command
-  # TODO implement
   class JavaSignCommandGenerator
     class << self
       def generate
         build_apk_path = Souyuz.cache[:build_apk_path]
-        signed_apk_path = "#{build_apk_path}-unaligned.apk"
+        Souyuz.cache[:signed_apk_path] = "#{build_apk_path}-unaligned"
 
         parts = prefix
         parts << detect_jarsigner_executable
@@ -23,10 +22,9 @@ module Souyuz
       end
 
       def detect_jarsigner_executable
-         jarsigner = ENV['JAVA_HOME'] ? File.join(ENV['JAVA_HOME'], 'bin', 'jarsigner') : 'jarsigner'
-         UI.user_error! 'Jarsigner executable not found, check if your `JAVA_HOME` env is set' unless system jarsigner
+        jarsigner = ENV['JAVA_HOME'] ? File.join(ENV['JAVA_HOME'], 'bin', 'jarsigner') : 'jarsigner'
 
-         jarsigner
+        jarsigner
       end
 
       def options
@@ -39,14 +37,14 @@ module Souyuz
         options << "-storepass #{config[:keystore_password]}"
         options << "-keystore #{config[:keystore_path]}"
         options << "-tsa #{config[:keystore_tsa]}"
-        options << "-signedjar #{Souyuz.cache[:build_apk_path]}"
+        options << "-signedjar #{Souyuz.cache[:signed_apk_path]}"
 
         options
       end
 
       def pipe
         pipe = []
- 
+
         pipe
       end
     end

data/lib/souyuz/generators/zip_dsym_command_generator.rb

@@ -0,0 +1,46 @@
+# -*- encoding : utf-8 -*-
+module Souyuz
+  # Responsible for building the zip dsym command
+  class ZipDsymCommandGenerator
+    class << self
+      def generate
+        parts = prefix
+        parts << detect_zip_executable
+        parts += options
+        parts << build_apk_path
+        parts += pipe
+
+        parts
+      end
+
+      def prefix
+        ["set -o pipefail &&"]
+      end
+
+      def detect_zip_executable
+        # dunno if anyone wants a zip which is not available thorgh PATH
+        # but if this case exists, we provide the opportunity to do so
+        zip = ENV['SOUYUZ_ZIP_PATH'] || 'zip'
+
+        zip
+      end
+
+      def options
+        build_dsym_path = Souyuz.cache[:build_dsym_path]
+
+        options = []
+        options << "-r"
+        options << "#{build_dsym_path}.zip"
+        options << build_dsym_path
+
+        options
+      end
+
+      def pipe
+        pipe = []
+
+        pipe
+      end
+    end
+  end
+end

data/lib/souyuz/manager.rb

@@ -7,8 +7,8 @@ module Souyuz
       Souyuz.config = options
 
       FastlaneCore::PrintTable.print_values(config: Souyuz.config,
-                                         hide_keys: [],
-                                             title: "Summary for souyuz #{Souyuz::VERSION}")
+                                            hide_keys: [],
+                                            title: "Summary for souyuz #{Souyuz::VERSION}")
 
       return Runner.new.run
     end

data/lib/souyuz/msbuild/project.rb

@@ -20,8 +20,8 @@ module Souyuz
         is_platform? Souyuz::Platform::IOS
       end
 
-      def mac?
-        is_platform? Souyuz::Platform::MAC
+      def osx?
+        is_platform? Souyuz::Platform::OSX
       end
 
       def android?
@@ -32,7 +32,7 @@ module Souyuz
         return case platform
           when Souyuz::Platform::IOS 
             then self.project_name.downcase.include? 'ios'
-          when Souyuz::Platform::MAC 
+          when Souyuz::Platform::OSX 
             then self.project_name.downcase.include? 'mac'
           when Souyuz::Platform::ANDROID 
             then self.project_name.downcase.include? 'droid'

data/lib/souyuz/options.rb

@@ -1,6 +1,5 @@
 # -*- encoding : utf-8 -*-
 require "fastlane_core"
-require "credentials_manager"
 
 module Souyuz
   class Options
@@ -38,7 +37,7 @@ module Souyuz
                                      optional: true),
         FastlaneCore::ConfigItem.new(key: :platform,
                                      env_name: "SOUYUZ_PLATFORM",
-                                     description: "Targeted device platform (i.e. android, ios, mac)",
+                                     description: "Targeted device platform (i.e. android, ios, osx)",
                                      optional: false),
         FastlaneCore::ConfigItem.new(key: :solution_path,
                                      env_name: "SOUYUZ_SOLUTION_PATH",
@@ -52,6 +51,27 @@ module Souyuz
                                      env_name: "SOUYUZ_ANDROID_MANIFEST_PATH",
                                      description: "Path to the android manifest (xml) file",
                                      optional: true),
+        FastlaneCore::ConfigItem.new(key: :plist_path,
+                                     env_name: "SOUYUZ_IOS_PLIST_PATH",
+                                     description: "Path to the iOS plist file",
+                                     optional: true),
+        FastlaneCore::ConfigItem.new(key: :keystore_path,
+                                     env_name: "SOUYUZ_ANDROID_KEYSTORE_PATH",
+                                     description: "Path to the keystore",
+                                     optional: true),
+        FastlaneCore::ConfigItem.new(key: :keystore_alias,
+                                     env_name: "SOUYUZ_ANDROID_KEYSTORE_ALIAS",
+                                     description: "Alias of the keystore",
+                                     optional: true),
+        FastlaneCore::ConfigItem.new(key: :keystore_password,
+                                     env_name: "SOUYUZ_ANDROID_KEYSTORE_PASSWORD",
+                                     description: "Password of the keystore",
+                                     optional: true),
+        FastlaneCore::ConfigItem.new(key: :keystore_tsa,
+                                     default_value: 'http://timestamp.digicert.com',
+                                     env_name: "SOUYUZ_ANDROID_KEYSTORE_TSA",
+                                     description: "TSA for jarsigner",
+                                     optional: true),
       ]
     end
   end

data/lib/souyuz/platform.rb

@@ -2,7 +2,15 @@
 module Souyuz
   module Platform
     IOS = 'ios'
-    MAC = 'mac'
+    OSX = 'osx'
     ANDROID = 'android'
+
+    def self.from_lane_context(context)
+      current_platform = context[:PLATFORM_NAME].to_s
+
+      # map in the future, if necessary
+
+      current_platform
+    end
   end
 end

data/lib/souyuz/runner.rb

@@ -2,16 +2,22 @@
 module Souyuz
   class Runner
     def run
+      config = Souyuz.config
+
       build_app
 
-      if Souyuz.project.ios? or Souyuz.project.mac?
+      if Souyuz.project.ios? or Souyuz.project.osx?
         compress_and_move_dsym
         path = ipa_file
 
         path
       elsif Souyuz.project.android?
         path = apk_file
-        # jarsign_and_zipalign TODO implement later
+        if (config[:keystore_path] && config[:keystore_alias])
+          UI.success "Jar it, sign it, zip it..."
+
+          jarsign_and_zipalign
+        end
 
         path
       end
@@ -20,8 +26,8 @@ module Souyuz
     def build_app
       command = BuildCommandGenerator.generate
       FastlaneCore::CommandExecutor.execute(command: command,
-                                          print_all: true,
-                                      print_command: !Souyuz.config[:silent])
+                                            print_all: true,
+                                            print_command: !Souyuz.config[:silent])
     end
 
     #
@@ -32,19 +38,23 @@ module Souyuz
       build_path = Souyuz.project.options[:output_path]
       assembly_name = Souyuz.project.options[:assembly_name]
 
+      Souyuz.cache[:build_apk_path] = "#{build_path}/#{assembly_name}.apk"
+
       "#{build_path}/#{assembly_name}.apk"
     end
 
     def jarsign_and_zipalign
       command = JavaSignCommandGenerator.generate
       FastlaneCore::CommandExecutor.execute(command: command,
-                                          print_all: true,
-                                      print_command: !Souyuz.config[:silent])
+                                            print_all: false,
+                                            print_command: !Souyuz.config[:silent])
+
+      UI.success "Successfully signed apk #{Souyuz.cache[:build_apk_path]}"
 
       command = AndroidZipalignCommandGenerator.generate
       FastlaneCore::CommandExecutor.execute(command: command,
-                                          print_all: true,
-                                      print_command: !Souyuz.config[:silent])
+                                            print_all: true,
+                                            print_command: !Souyuz.config[:silent])
     end
 
     #
@@ -65,20 +75,18 @@ module Souyuz
     end
 
     def compress_and_move_dsym
-      require 'fileutils'
       build_path = Souyuz.project.options[:output_path]
       assembly_name = Souyuz.project.options[:assembly_name]
-      dsym_path = "#{build_path}/#{assembly_name}.app.dSYM"
 
-      # compress dsym using zip
-      if File.exists? dsym_path
-        zip = ENV['SOUYUZ_ZIP_PATH'] || 'zip'
-        command = "#{zip} -r #{dsym_path}.zip #{dsym_path}"
-        Helper.backticks(command, print: !Souyuz.config[:silent])
-        dsym_path = "#{dsym_path}.zip"
-      end
+      Souyuz.cache[:build_dsym_path] = "#{build_path}/#{assembly_name}.app.dSYM"
+
+      command = ZipDsymCommandGenerator.generate
+      FastlaneCore::CommandExecutor.execute(command: command,
+                                            print_all: true,
+                                            print_command: !Souyuz.config[:silent])
 
       # move dsym aside ipa
+      dsym_path = "#{dsym_path}.zip"
       if File.exists? dsym_path
         FileUtils.mv(dsym_path, "#{package_path}/#{File.basename dsym_path}")
       end

data/lib/souyuz/version.rb

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

data/lib/souyuz.rb

@@ -3,6 +3,9 @@ require 'souyuz/version'
 require 'souyuz/platform'
 require 'souyuz/manager'
 require 'souyuz/generators/build_command_generator'
+require 'souyuz/generators/android_zipalign_command_generator'
+require 'souyuz/generators/java_sign_command_generator'
+require 'souyuz/generators/zip_dsym_command_generator'
 require 'souyuz/runner'
 require 'souyuz/options'
 require 'souyuz/detect_values'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: souyuz
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Felix Rudat
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-26 00:00:00.000000000 Z
+date: 2017-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -16,34 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
-- !ruby/object:Gem::Dependency
-  name: fastlane_core
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.41.2
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.41.2
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: magic_encoding
   requirement: !ruby/object:Gem::Requirement
@@ -86,20 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.1.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.1.0
 description: A fastlane component to make Xamarin builds a breeze
 email: voydz@hotmail.com
 executables:
@@ -116,6 +82,7 @@ files:
 - lib/souyuz/generators/android_zipalign_command_generator.rb
 - lib/souyuz/generators/build_command_generator.rb
 - lib/souyuz/generators/java_sign_command_generator.rb
+- lib/souyuz/generators/zip_dsym_command_generator.rb
 - lib/souyuz/manager.rb
 - lib/souyuz/msbuild/project.rb
 - lib/souyuz/msbuild/solution.rb