objctify 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5c95f59ad2258c5a663594fe4d89293c2d10c4a1
-  data.tar.gz: 64dcaa5dc1daa4d32bc96c7a20875e54065252d4
+SHA256:
+  metadata.gz: a011b3ca7aac11ee55f7bcf54f7b62d896a2a0921595c254436fb23e8aaf3c18
+  data.tar.gz: 44ac8c35c6f70190b0ff1d5adce484d3ccd1a8bf5fc0eee4dbbcc3b2df7736d5
 SHA512:
-  metadata.gz: e908bb6677129073525dd2d72ce52e7cc1fc1022804c64b1fc9d17eba5e2dcb4b950278791d8126c748decfbc15759fd820a6db0919edc12a12ee3307174ff86
-  data.tar.gz: 7a0ba46525cdead779f0b9c34a7f0c0d50f916f61377c24b879dfdb2c65e5e9db5576b855b4c70f979650592365b8e5b11f2d77200529e7a7e00e54c8ae2e402
+  metadata.gz: 4c788b1f4c6a0ab256b72a828179be752a46cb6ff83913494dc96e053804816dd40b178fe89cf64b4ae707d48c30e4cf3035cb8c4c628f960f00ed1f7de2ddee
+  data.tar.gz: 21eaf4feeb10e03c9942af02e56d2f89b736c0c723331bfbd422001724811a03e6a7dc331c60f693f4083cc211696bd2e61abfd444e70b987fbfea42ddaf7fa9

data/LICENSE

@@ -370,4 +370,4 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice
 ---------------------------------------------------------
 
   This Source Code Form is "Incompatible With Secondary Licenses", as
-  defined by the Mozilla Public License, v. 2.0.
+  defined by the Mozilla Public License, v. 2.0.

data/lib/objctify/command.rb

@@ -16,7 +16,7 @@ module Objctify
     self.abstract_command = true
     self.command = 'objctify'
     self.version = Objctify::VERSION
-    self.description = 'Make life easier' #TODO
-    self.plugin_prefixes = %w(claide objctify)
+    self.description = 'A tool'
+    self.plugin_prefixes = %w[claide objctify]
   end
 end

data/lib/objctify/command/init.rb

@@ -8,8 +8,8 @@
 module Objctify
   class Command
     class Init < Command
-      self.summary = 'Creates xcodeproj from java sources with j2objc' #TODO
-      self.description = 'Creates xcodeproj from java source with j2objc using configuration from Objctifile' #TODO
+      self.summary = 'Initialises an Objctifile in the current directory.'
+      self.description = 'Initialises an Objctifile in the current directory from a default template.'
 
       def run
         template_path = "#{File.dirname(__FILE__)}/../templates/Objctifile-template"

data/lib/objctify/command/this.rb

@@ -14,35 +14,42 @@ module Objctify
       def run
         file_path = "#{Dir.pwd}/Objctifile"
 
-        raise Objctify::Informative, "Couldn't find Objctifile" unless File.exists?(file_path)
+        unless File.exist?(file_path)
+          raise Objctify::Informative, "Couldn't find Objctifile"
+        end
 
         file_contents = File.read(file_path)
 
         project = Context.new
         project.instance_eval(file_contents, file_path)
 
-        raise Objctify::Informative, "Project name is not provided in Objctifile" unless
-            project.project_name_param != nil
-        raise Objctify::Informative, "Path to Java sources is not provided in Objctifile" unless
-            project.java_sources_param != nil
+        if project.project_name_param.nil?
+          raise Objctify::Informative, "Project name is not provided in Objctifile"
+        end
+        if project.java_sources_param.nil?
+          raise Objctify::Informative, "Path to Java sources is not provided in Objctifile"
+        end
         raise Objctify::Informative, "Provided Java sources directory does not exist: #{project.java_sources_param}" unless
-            Dir.exists?(project.java_sources_param)
+            Dir.exist?(project.java_sources_param)
 
         framework_name = project.project_name_param
         java_sources = File.expand_path(project.java_sources_param)
         j2objc_home = File.expand_path(project.j2objc_config.distr_dir)
 
         raise Objctify::Informative, "J2ObjC home directory does not exist: #{j2objc_home}" unless
-            Dir.exists?(j2objc_home)
+            Dir.exist?(j2objc_home)
         raise Objctify::Informative, "J2ObjC home directory doesn't contain j2objc: #{j2objc_home}" unless
-            File.exists?("#{j2objc_home}/j2objc")
+            File.exist?("#{j2objc_home}/j2objc")
 
         unless project.j2objc_config.prefixes_file_path.nil?
-          raise Objctify::Informative, "Specified prefixes files does not exist: #{project.j2objc_config.prefixes_file_path}" unless File.exists?(project.j2objc_config.prefixes_file_path)
+          unless File.exist?(project.j2objc_config.prefixes_file_path)
+            raise Objctify::Informative, "Specified prefixes files does not exist: #{project.j2objc_config.prefixes_file_path}"
+          end
+
           prefix_file_path = File.expand_path(project.j2objc_config.prefixes_file_path)
         end
 
-        Objctify::translate_files(java_sources, prefix_file_path, j2objc_home, framework_name)
+        Objctify::translate_files(java_sources, prefix_file_path, j2objc_home, framework_name, project.j2objc_config.extra_cli_args)
         puts 'Cleaning'
         Objctify::fix_imports(framework_name, prefix_file_path)
         puts 'Plumbing'

data/lib/objctify/context.rb

@@ -8,14 +8,14 @@
 module Objctify
   class Context
     class J2ObjCSettings
-      attr_accessor :distr_dir, :prefixes_file_path
+      attr_accessor :distr_dir, :prefixes_file_path, :extra_cli_args
     end
 
-    attr_accessor :project_name_param, :java_sources_param, :j2objc_config
+    attr_accessor :project_name_param, :java_sources_param
 
     def initialize
       @j2objc_config = J2ObjCSettings.new
-      @project_name = ""
+      @project_name = ''
     end
 
     def project_name(project_name)

data/lib/objctify/fix_imports.rb

@@ -10,35 +10,35 @@ module Objctify
   def self.fix_imports(framework_name, prefix_file_path)
     prefixes = J2ObjCPrefixes.new(prefix_file_path)
 
-    header_map = Hash.new
+    header_map = {}
     Dir.chdir(framework_name) do
-      Pathname(".").find do |path|
+      Pathname('.').find do |path|
         dir, base = path.split
 
-        if path.file?
-          prefix = prefixes.prefix_for(path.dirname.to_s)
-          path.rename(dir.to_s + '/' + prefix + base.to_s)
-          header_map[path.to_s.sub("./", "")] = prefix + base.to_s
-        end
+        next unless path.file?
+
+        prefix = prefixes.prefix_for(path.dirname.to_s)
+        path.rename(dir.to_s + '/' + prefix + base.to_s)
+        header_map[path.to_s.sub('./', '')] = prefix + base.to_s
       end
     end
 
     Dir.chdir(framework_name) do
-      Pathname(".").find do |path|
-        if path.file?
-          import_reg_exp = /(#[a-zA-Z]+\s+"([a-zA-Z_0-9\/]+.[hm]{1})")/
+      Pathname('.').find do |path|
+        next unless path.file?
 
-          text = File.read(path)
-          text.scan(import_reg_exp).each { |import|
+        import_reg_exp = %r{(#[a-zA-Z]+\s+"([a-zA-Z_0-9/]+.[hm]{1})")}
 
-            if (mapped_import = header_map[import[1]]) and !mapped_import.nil?
-              text = text.gsub(import[1], mapped_import)
-            end
-          }
+        text = File.read(path)
+        text.scan(import_reg_exp).each do |import|
+
+          if (mapped_import = header_map[import[1]]) && !mapped_import.nil?
+            text = text.gsub(import[1], mapped_import)
+          end
+        end
 
-          File.open(path, "w") { |f|
-            f.write(text)
-          }
+        File.open(path, 'w') do |f|
+          f.write(text)
         end
       end
     end

data/lib/objctify/generate_project.rb

@@ -16,7 +16,7 @@ module Objctify
     source_build_phase = target.source_build_phase
     headers_build_phase = target.headers_build_phase
 
-#add files
+    #add files
     Pathname(framework_name).find do |path|
       dir, base = path.split
       if path.directory?
@@ -35,7 +35,7 @@ module Objctify
 
         if new_ref.last_known_file_type == 'sourcecode.c.h'
           build_file = headers_build_phase.add_file_reference new_ref
-          build_file.settings = {"ATTRIBUTES" => ['', 'Public']}
+          build_file.settings = { ATTRIBUTES: ['', 'Public'] }
         elsif new_ref.last_known_file_type == 'sourcecode.c.objc'
           source_build_phase.add_file_reference new_ref
         end
@@ -45,7 +45,7 @@ module Objctify
 
     header_file_path = Pathname("#{framework_name}/#{framework_name}.h")
 
-    File.open(header_file_path, "w") do |header_file|
+    File.open(header_file_path, 'w') do |header_file|
       header_template = "//
 //  #{framework_name}.h
 //  #{framework_name}
@@ -63,32 +63,32 @@ FOUNDATION_EXPORT const unsigned char #{framework_name}VersionString[];
 "
 
       header_file.write(header_template)
-      header_file.write(headers_build_phase.files_references.map(&:path).map { |header_file_name| "#include <#{framework_name}/" + header_file_name + ">" } * "\n")
+      header_file.write(headers_build_phase.files_references.map(&:path).map { |header_file_name| "#include <#{framework_name}/" + header_file_name + '>' } * "\n")
     end
 
     dir, base = header_file_path.split
 
     header_file_ref = project[dir.to_s].new_reference base
     header_build_file = headers_build_phase.add_file_reference header_file_ref
-    header_build_file.settings = {"ATTRIBUTES" => ['', 'Public']}
+    header_build_file.settings = { ATTRIBUTES: ['', 'Public'] }
 
     project.targets.each do |target|
-      target.add_system_library_tbd(%w{z iconv})
-      target.add_system_framework("UIKit")
+      target.add_system_library_tbd(%w[z iconv])
+      target.add_system_framework('UIKit')
 
       path = File.expand_path("#{j2objc_home}/frameworks/JRE.framework")
-      unless ref = project.frameworks_group.find_file_by_path(path)
+      unless (ref = project.frameworks_group.find_file_by_path(path))
         ref = project.frameworks_group.new_file(path, :absolute)
       end
       target.frameworks_build_phase.add_file_reference(ref, true)
 
       target.build_configurations.each do |config|
-        config.build_settings["CLANG_ENABLE_OBJC_ARC"] = false
-        config.build_settings["FRAMEWORK_SEARCH_PATHS"] = "#{j2objc_home}/frameworks"
-        config.build_settings["HEADER_SEARCH_PATHS"] = "#{j2objc_home}/frameworks/JRE.framework/Headers"
+        config.build_settings['CLANG_ENABLE_OBJC_ARC'] = false
+        config.build_settings['FRAMEWORK_SEARCH_PATHS'] = "#{j2objc_home}/frameworks"
+        config.build_settings['HEADER_SEARCH_PATHS'] = "#{j2objc_home}/frameworks/JRE.framework/Headers"
 
         # Workaround
-        config.build_settings["SUPPORTS_MACCATALYST"] = false
+        config.build_settings['SUPPORTS_MACCATALYST'] = false
       end
     end
 

data/lib/objctify/j2objc/j2_obj_c_prefixes.rb

@@ -10,34 +10,32 @@ module Objctify
     Prefix = Struct.new(:prefix, :wildcard)
 
     def initialize(prefix_file_path)
-      @prefixes = Hash.new
-
-      if !prefix_file_path.nil? && File.exists?(prefix_file_path)
-        File.open(prefix_file_path).each do |line|
-          if (res = line.match(/([a-zA-Z.*]+):\s+([A-Z]+)/))
-            key = res[1]
-            @prefixes[key.gsub(".*", "")] = Prefix.new(res[2], key.include?("*"))
-          end
+      @prefixes = {}
+
+      return unless !prefix_file_path.nil? && File.exist?(prefix_file_path)
+
+      File.open(prefix_file_path).each do |line|
+        if (res = line.match(/([a-zA-Z.*]+):\s+([A-Z]+)/))
+          key = res[1]
+          @prefixes[key.gsub('.*', '')] = Prefix.new(res[2], key.include?('*'))
         end
       end
     end
 
-      def prefix_for(path)
-        key = path.gsub("/", ".")
-
-        # searching for direct prefix
-        # Fallback to looking for wildcard. if found a wildcard return it, else prefix from path
-        while key.length != 0 do
-          @prefixes.keys.each { |p|
-            if key == p
-              return @prefixes[p].prefix
-            end
-          }
-          key, match, suffix = key.rpartition('.')
-        end
+    def prefix_for(path)
+      key = path.gsub('/', '.')
 
-        path.gsub("./", "").gsub("/", ".").split(".").map { |s| s.capitalize } * ""
+      # searching for direct prefix
+      # Fallback to looking for wildcard. if found a wildcard return it, else prefix from path
+      until key.empty?
+        @prefixes.keys.each do |p|
+          return @prefixes[p].prefix if key == p
+        end
+        key, = key.rpartition('.')
       end
 
+      path.gsub('./', '').gsub('/', '.').split('.').map(&:capitalize) * ''
     end
+
   end
+end

data/lib/objctify/templates/Objctifile-template

@@ -10,4 +10,5 @@
 j2objc_config do |j2objc_config|
   j2objc_config.distr_dir = "path_to_j2objc_distributive"
 #  j2objc_config.prefixes_file_path = "path_to/prefixes.properties"
+#  j2objc_config.extra_cli_args = "-Xno-source-headers --strip-reflection"
 end

data/lib/objctify/translator_runner.rb

@@ -8,26 +8,32 @@
 module Objctify
 
   def self.collect_files(java_source_path)
-    files_to_translate = ""
-    Dir.glob(java_source_path + "/**/*.java") do |item|
-      files_to_translate = files_to_translate + item + " "
+    files_to_translate = ''
+    Dir.glob(java_source_path + '/**/*.java') do |item|
+      files_to_translate = files_to_translate + item + ' '
     end
     files_to_translate
   end
 
-  def self.translate_files(java_sources, prefix_file_path, j2objc_home, result_path)
+  def self.translate_files(java_sources, prefix_file_path, j2objc_home, result_path, extra_cli_args)
     files_to_translate = collect_files(java_sources)
 
-    raise Objctify::Informative, "No files to translate, check 'java_sources' parameter in Objctifile" unless files_to_translate.length > 0
+    raise Objctify::Informative, "No files to translate, check 'java_sources' parameter in Objctifile" if files_to_translate.empty?
 
-    j2objcCall = "#{j2objc_home}/j2objc -source 8 --swift-friendly -Xno-source-headers -l --strip-reflection -d #{result_path} -classpath j2objc-dist/lib/jsr305-3.0.0.jar -sourcepath #{java_sources}"
-    unless prefix_file_path.nil? || prefix_file_path == ""
-      j2objcCall += " --prefixes #{prefix_file_path}"
+    j2objc_call = compose_j2objc_call(java_sources, j2objc_home, prefix_file_path, result_path, extra_cli_args) + ' ' + files_to_translate
+    call = system(j2objc_call)
+
+    raise Objctify::Informative, "J2Objc call is unsuccessful: #{j2objc_call}" unless call
+  end
+
+  def self.compose_j2objc_call(java_sources, j2objc_home, prefix_file_path, result_path, extra_cli_args)
+    j2objc_call = "#{j2objc_home}/j2objc -source 8 --swift-friendly -l #{extra_cli_args} -d #{result_path} -classpath #{j2objc_home}/lib/jsr305-3.0.0.jar -sourcepath #{java_sources}"
+
+    unless prefix_file_path.nil? || prefix_file_path == ''
+      j2objc_call += " --prefixes #{prefix_file_path}"
     end
-    j2objcCall += " #{files_to_translate}"
-    call = system(j2objcCall)
 
-    raise Objctify::Informative, "J2Objc call is unsuccessful: #{j2objcCall}" unless call
+    j2objc_call
   end
 
 end

data/lib/objctify/version.rb

@@ -6,5 +6,5 @@
 # file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 module Objctify
-  VERSION = "0.3.1".freeze
+  VERSION = "0.4.0".freeze
 end

data/objctify.gemspec

@@ -1,13 +1,13 @@
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "objctify/version"
+require 'objctify/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "objctify"
+  spec.name          = 'objctify'
   spec.version       = Objctify::VERSION
   spec.license       = 'MPL-2.0'
-  spec.authors       = ["Devexperts"]
-  spec.email         = ["opensource@devexperts.com"]
+  spec.authors       = ['Devexperts']
+  spec.email         = ['opensource@devexperts.com']
 
   spec.summary       = %q{Automates translation of Java sources into Objective-C using J2ObjC tool by Google}
   spec.description   = %q{A gem which helps you literally use Java on iOS. It is a wrapper of J2ObjC tool by Google, which handles the most of
@@ -18,13 +18,13 @@ routine actions. Basically it turns your Java sources into an iOS framework read
     f.match(%r{^(test|spec|features|pkg|example)/})
   end
   spec.executables   = %w(objctify)
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
   spec.required_ruby_version = '>= 2.0.0'
 
   spec.add_dependency 'claide', '< 2.0', '>= 0.9.1'
   spec.add_dependency 'xcodeproj', '< 2.0.0', '>= 1.3.0'
 
-  spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency 'bundler', '~> 1.16'
+  spec.add_development_dependency 'rake', '~> 10.0'
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: objctify
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Devexperts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-09 00:00:00.000000000 Z
+date: 2020-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: xcodeproj
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 2.0.0
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 2.0.0
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -127,8 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Automates translation of Java sources into Objective-C using J2ObjC tool