swift-tools 3.3.1 → 3.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ca9eb32af44c993c6348d15764e0d2b5b1ef0df
-  data.tar.gz: 818703f094286afdfedfc1a3bfa7f2595faecdf3
+  metadata.gz: 1b16afed69d275ebc272c00bbe3e1c734ac3e9b7
+  data.tar.gz: 9164ff0950847c122363aa0035511ab3bcf90e19
 SHA512:
-  metadata.gz: d26c9baed3e339375677f8aa18ade8069326d7ed501a2ed8c9b5f338d181d7b2439ecd89f197e3ef1d0b8ba241714473dc251382c4a390215adb4a1941f84574
-  data.tar.gz: bf3ffd29c016be72a57c0518c1da4e2b2f1c15b52b8e00d221c80a60e6a48047dc4f2d1150c1689c3aae300c89f95bf161939df9ab9ed71cab3cf13b401123c4
+  metadata.gz: e65c9ff73758246e0ee82b7b8c8411795d46d17aacedb85c36382b90c92e6c7f41e790df82d62040ad71b303cee63ee31577f3b1ab2bdbffce8c5ccc97436e62
+  data.tar.gz: dc2e47471e4af639cbda605f2690855f2eaf723b5a05af8a23b403023535f0991d97b9855b19166af89ad185cb549aad9050f2dfcb47dd74987835d92497762d

data/bin/csharp2swift

@@ -1,9 +1,10 @@
 #!/usr/bin/env ruby
 
 require 'rubygems'
-require 'bundler/setup'
+require 'bundler'
 require 'methadone'
-require 'swift_tools'
+require 'swift_tools/version'
+require 'swift_tools/csharp_2_swift'
 
 module SwiftTools
   class Tool
@@ -17,7 +18,7 @@ module SwiftTools
       end
 
       cs_file = File.new(cs_filename, "r")
-      swift_filename = options[:swift_filename]
+      swift_filename = options[:o]
 
       if swift_filename.nil?
         swift_file = STDOUT
@@ -28,7 +29,9 @@ module SwiftTools
       tool = Csharp2Swift.new
       tool.execute(cs_file, swift_file, options)
 
-      info "\"#{cs_filename}\" -> \"#{swift_filename}\""
+      unless swift_filename.nil?
+        info "\"#{cs_filename}\" -> \"#{swift_filename}\""
+      end
 
       tool.renamed_vars.each {|k,v| puts k + ' -> ' + v}
       tool.renamed_methods.each {|k,v| puts k + '() -> ' + v + '()'}

data/bin/objc2swift

@@ -3,8 +3,8 @@
 require 'rubygems'
 require 'bundler'
 require 'methadone'
-require 'objc_2_swift'
-require 'swift_tools'
+require 'swift_tools/objc_2_swift'
+require 'swift_tools/version'
 
 module SwiftTools
   class Tool
@@ -44,7 +44,9 @@ module SwiftTools
       tool = ObjC2Swift.new
       tool.execute(h_file, m_file, swift_file, options)
 
-      info "\"#{h_filename}\"" + (m_filename.nil? ? '' : " + \"#{m_filename}\"") + " -> \"#{swift_filename}\""
+      unless swift_filename.nil?
+        info "\"#{h_filename}\"" + (m_filename.nil? ? '' : " + \"#{m_filename}\"") + " -> \"#{swift_filename}\""
+      end
    end
 
     version SwiftTools::VERSION

data/lib/{csharp_2_swift.rb → swift_tools/csharp_2_swift.rb}

@@ -1,4 +1,4 @@
-require_relative './core_ext.rb'
+require 'swift_tools/core_ext.rb'
 
 module SwiftTools
   class Csharp2Swift
@@ -273,4 +273,4 @@ module SwiftTools
     end
 
   end
-end
+end

data/lib/swift_tools/version.rb

@@ -0,0 +1,3 @@
+module SwiftTools
+  VERSION = "3.3.2"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: swift-tools
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.3.2
 platform: ruby
 authors:
 - John Lyon-smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-07 00:00:00.000000000 Z
+date: 2017-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: methadone
@@ -49,10 +49,10 @@ extra_rdoc_files: []
 files:
 - bin/csharp2swift
 - bin/objc2swift
-- lib/core_ext.rb
-- lib/csharp_2_swift.rb
-- lib/objc_2_swift.rb
-- lib/swift_tools.rb
+- lib/swift_tools/core_ext.rb
+- lib/swift_tools/csharp_2_swift.rb
+- lib/swift_tools/objc_2_swift.rb
+- lib/swift_tools/version.rb
 homepage: http://rubygems.org/gems/swift-tools
 licenses:
 - MIT

data/lib/swift_tools.rb

@@ -1,6 +0,0 @@
-require 'csharp_2_swift'
-require 'objc_2_swift'
-
-module SwiftTools
-  VERSION = "3.3.1"
-end