app-info 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 223887d0f8f212116e95c94ad9c7719821b087ce
-  data.tar.gz: 2f5bd1d0bbcfcd1ef1b686d87cba545f5be2d005
+  metadata.gz: bf857c2c3bd200c345b20018226ba6e110a1333e
+  data.tar.gz: 952b70193619d07dd8dd94c6b580017d393a2efa
 SHA512:
-  metadata.gz: 87f81624016cfbc221a7a24f0494998749ee2d5c5c8cfc49c42c50af256268e7f0614b8b5212f06aaa531b3da2a42cc6e6d828f9ce25af010ff93298c31b1883
-  data.tar.gz: 0c426700c7e15ec6784635a9125e726e50eee6dbebf7de10676f8aaa7ecbe8259e5ddb89278f9460be07ad26eeb69a7fa20b0649d5c199d7abd951667444bae6
+  metadata.gz: b569637dbf441d2e4d823408f922c0aed502a75a791cf89a32d31200e3843e651352d6a547cc1267d7173d7b71886df6ca57cfff2290f4a3598b32af02fa45fa
+  data.tar.gz: a3dfe2c7e4045611369b958c08901d6ee626703a4f71650a165a9d812f30b8350a55e7de750bf95d9bd80775228afbf5291d430073670e32764523eb47ff6a3e

data/app_info.gemspec

@@ -21,7 +21,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'pngdefry', '~> 0.1.2'
   spec.add_dependency 'ruby_android', '~> 0.7.7'
   spec.add_dependency 'image_size', '~> 1.5.0'
-  spec.add_dependency 'os', '~> 0.9.6'
 
   spec.add_development_dependency 'bundler', '~> 1.12'
   spec.add_development_dependency 'rake', '~> 10.0'

data/lib/app_info/parser.rb

@@ -10,5 +10,9 @@ module AppInfo
       IOS = 'iOS'.freeze
       ANDROID = 'Android'.freeze
     end
+
+    def self.mac?
+      RbConfig::CONFIG['host_os'] =~ /darwin/ ? true : false
+    end
   end
 end

data/lib/app_info/parser/ipa.rb

@@ -1,4 +1,3 @@
-require 'os'
 require 'pngdefry'
 require 'fileutils'
 require 'securerandom'
@@ -17,6 +16,7 @@ module AppInfo
         ADHOC = 'AdHoc'.freeze
         INHOUSE = 'inHouse'.freeze
         RELEASE = 'Release'.freeze
+        UNKOWN = nil
       end
 
       def initialize(file)
@@ -28,6 +28,18 @@ module AppInfo
         Parser::Platform::IOS
       end
 
+      def iphone?
+        info.iphone?
+      end
+
+      def ipad?
+        info.ipad?
+      end
+
+      def universal?
+        info.universal?
+      end
+
       def build_version
         info.build_version
       end
@@ -56,6 +68,10 @@ module AppInfo
         info.icons
       end
 
+      def device_type
+        info.device_type
+      end
+
       def devices
         mobileprovision.devices
       end
@@ -80,22 +96,6 @@ module AppInfo
         "#{profile_name} - #{team_name}" if profile_name && team_name
       end
 
-      def device_type
-        info.device_type
-      end
-
-      def iphone?
-        info.iphone?
-      end
-
-      def ipad?
-        info.ipad?
-      end
-
-      def universal?
-        info.universal?
-      end
-
       def release_type
         if stored?
           ExportType::RELEASE
@@ -105,6 +105,8 @@ module AppInfo
       end
 
       def build_type
+        return ExportType::UNKOWN unless AppInfo::Parser.mac?
+
         if mobileprovision?
           if devices
             ExportType::ADHOC
@@ -124,25 +126,13 @@ module AppInfo
         mobileprovision.delete('DeveloperCertificates') if mobileprovision?
       end
 
-      def cleanup!
-        return unless @contents
-        FileUtils.rm_rf(@contents)
-
-        @contents = nil
-        @icons = nil
-        @app_path = nil
-        @metadata = nil
-        @metadata_path = nil
-        @info = nil
-      end
-
       def mobileprovision
         return unless mobileprovision?
         return @mobileprovision if @mobileprovision
 
-        return MobileProvision.new(nil) unless OS.mac?
+        file = AppInfo::Parser.mac? ? mobileprovision_path : nil
 
-        @mobileprovision = MobileProvision.new(mobileprovision_path)
+        @mobileprovision = MobileProvision.new(file)
       end
 
       def mobileprovision?
@@ -180,6 +170,18 @@ module AppInfo
         @app_path ||= Dir.glob(File.join(contents, 'Payload', '*.app')).first
       end
 
+      def cleanup!
+        return unless @contents
+        FileUtils.rm_rf(@contents)
+
+        @contents = nil
+        @icons = nil
+        @app_path = nil
+        @metadata = nil
+        @metadata_path = nil
+        @info = nil
+      end
+
       alias bundle_id identifier
 
       private

data/lib/app_info/parser/ipa/mobile_provision.rb

@@ -59,6 +59,8 @@ module AppInfo
       end
 
       def mobileprovision
+        return @mobileprovision = nil if @path.nil? or @path.empty? or !File.exist?(@path)
+
         data = `security cms -D -i "#{@path}"`
         @mobileprovision = CFPropertyList.native_types(CFPropertyList::List.new(data: data).value)
       rescue CFFormatError

data/lib/app_info/version.rb

@@ -1,3 +1,3 @@
 module AppInfo
-  VERSION = '1.0.2'.freeze
+  VERSION = '1.0.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: app-info
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - icyleaf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-06 00:00:00.000000000 Z
+date: 2016-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: CFPropertyList
@@ -66,20 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.5.0
-- !ruby/object:Gem::Dependency
-  name: os
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.6
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement