fruity_builder 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d8ae8d1b4b33450affa9d95e70c438bac84f250
-  data.tar.gz: 02aa4a49e613e1f7f330043e61dee0a09788ee45
+  metadata.gz: 840aa45bbec96aa6b16e53b63886b335ceb50b29
+  data.tar.gz: 35dded1625ff0a3d9d70c16c060e4d9b60fa6650
 SHA512:
-  metadata.gz: cab3fe1d9d54fb4b81f2b694ff0bef41c24b0ea65aa5289669c173c4fe9c79185d1eba26e68b67a75076a9401dd81e92d841b1af3e84a04d07aa18a0d1dc656d
-  data.tar.gz: 2ca8656316a5268d2e216d3cee62a56dfe1fa8b5af58dbf14bfb7c26a197069f671274c7a17690a636db951add469f8b20232cefcc0bffca0a12355ada85d72a
+  metadata.gz: b8a112412efd89a4235d4525129da6671ef56d3d6106c88a3ed1940d159e78297c1e8936c6b5ae1bbe1cab290dd9c2332a0478b2375f176aa6aee3090aca3fa1
+  data.tar.gz: 976fe8ccf7e0ab35f1129886de885680320c7ce7092a2db57d8e9867d316009afd926a5576ba5eaae66a111fed49d857e9512890393e7b52caa945b933cdacd7

data/lib/fruity_builder/plistutil.rb

@@ -2,92 +2,94 @@ require 'fruity_builder/lib/execution'
 require 'ox'
 
 module FruityBuilder
-  class Plistutil < Execution
+  module IOS
+    class Plistutil < Execution
 
-    def self.get_xml(options = {})
-      if options.key?(:file)
-        IO.read(options[:file])
-      elsif options.key?(:xml)
-        options[:xml]
+      def self.get_xml(options = {})
+        if options.key?(:file)
+          IO.read(options[:file])
+        elsif options.key?(:xml)
+          options[:xml]
+        end
       end
-    end
 
-    def self.get_bundle_id(options = {})
-      xml = get_xml(options)
+      def self.get_bundle_id(options = {})
+        xml = get_xml(options)
 
-      raise PlistutilCommandError.new('No XML was passed') unless xml
-      identifiers = xml.scan(/.*CFBundleIdentifier<\/key>\n\t<string>(.*?)<\/string>/)
-      identifiers << xml.scan(/.*CFBundleName<\/key>\n\t<string>(.*?)<\/string>/)
-      identifiers.flatten.uniq
-    end
+        raise PlistutilCommandError.new('No XML was passed') unless xml
+        identifiers = xml.scan(/.*CFBundleIdentifier<\/key>\n\t<string>(.*?)<\/string>/)
+        identifiers << xml.scan(/.*CFBundleName<\/key>\n\t<string>(.*?)<\/string>/)
+        identifiers.flatten.uniq
+      end
 
-    def self.replace_bundle_id(options = {})
-      xml = get_xml(options)
+      def self.replace_bundle_id(options = {})
+        xml = get_xml(options)
 
-      raise PlistutilCommandError.new('No XML was passed') unless xml
+        raise PlistutilCommandError.new('No XML was passed') unless xml
 
-      replacements = xml.scan(/.*CFBundleIdentifier<\/key>\n\t<string>(.*?)<\/string>/)
-      replacements << xml.scan(/.*CFBundleName<\/key>\n\t<string>(.*?)<\/string>/)
+        replacements = xml.scan(/.*CFBundleIdentifier<\/key>\n\t<string>(.*?)<\/string>/)
+        replacements << xml.scan(/.*CFBundleName<\/key>\n\t<string>(.*?)<\/string>/)
 
-      replacements.flatten.uniq.each do |replacement|
-        xml = xml.gsub(replacement, options[:new_id])
-      end
+        replacements.flatten.uniq.each do |replacement|
+          xml = xml.gsub(replacement, options[:new_id])
+        end
 
-      IO.write(options[:file], xml) if options.key?(:file)
-      xml
-    end
+        IO.write(options[:file], xml) if options.key?(:file)
+        xml
+      end
 
-    # Check to ensure that plistutil is available
-    # @return [Boolean] true if plistutil is available, false otherwise
-    def self.plistutil_available?
-      result = execute('which plistutil')
-      result.exit == 0
-    end
+      # Check to ensure that plistutil is available
+      # @return [Boolean] true if plistutil is available, false otherwise
+      def self.plistutil_available?
+        result = execute('which plistutil')
+        result.exit == 0
+      end
 
-    # Gets properties from the IPA and returns them in a hash
-    # @param [String] path path to the IPA/App
-    # @return [Hash] list of properties from the app
-    def self.get_bundle_id_from_app(path)
-      path = Signing.unpack_ipa(path) if Signing.is_ipa?(path)
-      get_bundle_id_from_plist("#{path}/Info.plist")
-    end
+      # Gets properties from the IPA and returns them in a hash
+      # @param [String] path path to the IPA/App
+      # @return [Hash] list of properties from the app
+      def self.get_bundle_id_from_app(path)
+        path = Signing.unpack_ipa(path) if Signing.is_ipa?(path)
+        get_bundle_id_from_plist("#{path}/Info.plist")
+      end
 
-    # Gets properties from the IPA and returns them in a hash
-    # @param [String] plist path to the plist
-    # @return [Hash] list of properties from the app
-    def self.get_bundle_id_from_plist(plist)
-      raise PlistutilCommandError.new('plistutil not found') unless plistutil_available?
-      result = execute("plistutil -i #{plist}")
-      raise PlistutilCommandError.new(result.stderr) if result.exit != 0
-      parse_xml(result.stdout)
-    end
+      # Gets properties from the IPA and returns them in a hash
+      # @param [String] plist path to the plist
+      # @return [Hash] list of properties from the app
+      def self.get_bundle_id_from_plist(plist)
+        raise PlistutilCommandError.new('plistutil not found') unless plistutil_available?
+        result = execute("plistutil -i #{plist}")
+        raise PlistutilCommandError.new(result.stderr) if result.exit != 0
+        parse_xml(result.stdout)
+      end
 
-    def self.parse_xml(xml)
-      info = Ox.parse(xml)
-      nodes = info.locate('*/dict')
-      values = {}
-      last_key = nil
-      nodes.each do |node|
-        node.nodes.each do |child|
-          if child.value == 'key'
-            if child.nodes.first == 'get-task-allow'
-              values['get-task-allow'] = nodes.first.nodes[nodes.first.nodes.index(child)+1].value
-              next
+      def self.parse_xml(xml)
+        info = Ox.parse(xml)
+        nodes = info.locate('*/dict')
+        values = {}
+        last_key = nil
+        nodes.each do |node|
+          node.nodes.each do |child|
+            if child.value == 'key'
+              if child.nodes.first == 'get-task-allow'
+                values['get-task-allow'] = nodes.first.nodes[nodes.first.nodes.index(child)+1].value
+                next
+              end
+              last_key = child.nodes.first
+            elsif child.value == 'string'
+              values[last_key] = child.nodes.first
             end
-            last_key = child.nodes.first
-          elsif child.value == 'string'
-            values[last_key] = child.nodes.first
           end
         end
+        values
       end
-      values
     end
-  end
 
-  # plistutil error class
-  class PlistutilCommandError < StandardError
-    def initialize(msg)
-      super(msg)
+    # plistutil error class
+    class PlistutilCommandError < StandardError
+      def initialize(msg)
+        super(msg)
+      end
     end
   end
 end

data/lib/fruity_builder/signing.rb

@@ -2,117 +2,121 @@ require 'fruity_builder/lib/execution'
 require 'fruity_builder/plistutil'
 
 module FruityBuilder
-  # Namespace for all methods encapsulating idevice calls
-  class Signing < Execution
+  module IOS
+    # Namespace for all methods encapsulating idevice calls
+    class Signing < Execution
+
+      # Check to see if the path is an IPA
+      def self.is_ipa?(path)
+        return true if (File.extname path).downcase == '.ipa'
+        false
+      end
 
-    # Check to see if the path is an IPA
-    def self.is_ipa?(path)
-      return true if (File.extname path).downcase == '.ipa'
-      false
-    end
+      def self.unpack_ipa(path)
+        folder = File.dirname(path)
+        target = (File.basename path, (File.extname path))
 
-    def self.unpack_ipa(path)
-      folder = File.dirname(path)
-      target = (File.basename path, (File.extname path))
+        # Check to see if the target has already been unzipped
+        return Dir["#{folder}/#{target}/Payload/*.app"].first if File.exists? ("#{folder}/#{target}/Payload/")
 
-      # Check to see if the target has already been unzipped
-      return Dir["#{folder}/#{target}/Payload/*.app"].first if File.exists? ("#{folder}/#{target}/Payload/")
+        result = execute("unzip '#{path}' -d '#{folder}/#{target}'")
+        raise SigningCommandError.new(result.stderr) if result.exit != 0
 
-      result = execute("unzip '#{path}' -d '#{folder}/#{target}'")
-      raise SigningCommandError.new(result.stderr) if result.exit != 0
+        Dir["#{folder}/#{target}/Payload/*.app"].first
+      end
 
-      Dir["#{folder}/#{target}/Payload/*.app"].first
-    end
+      def self.is_app_signed?(app_path)
+        app_path = unpack_ipa(app_path) if is_ipa?(app_path)
+        result = execute("codesign -d -vvvv '#{app_path}'")
 
-    def self.is_app_signed?(app_path)
-      app_path = unpack_ipa(app_path) if is_ipa?(app_path)
-      result = execute("codesign -d -vvvv '#{app_path}'")
+        if result.exit != 0
+          return false if /is not signed/.match(result.stderr)
+          raise SigningCommandError.new(result.stderr)
+        end
 
-      if result.exit != 0
-        return false if /is not signed/.match(result.stderr)
-        raise SigningCommandError.new(result.stderr)
+        true
       end
 
-      true
-    end
-
-    def self.sign_app(options = {})
-      cert          = options[:cert]
-      entitlements  = options[:entitlements]
-      app           = options[:app]
-      original_app  = nil
+      def self.sign_app(options = {})
+        cert          = options[:cert]
+        entitlements  = options[:entitlements]
+        app           = options[:app]
+        original_app  = nil
 
-      if is_ipa?(app)
-        original_app = app
-        app = unpack_ipa(app)
-      end
+        if is_ipa?(app)
+          original_app = app
+          app = unpack_ipa(app)
+        end
 
-      # Check to see if the entitlements passed in is a file or the XML
-      unless File.exists?(entitlements)
-        file = Tempfile.new('entitlements')
-        file.write(entitlements)
-        file.close
-        entitlements = file.path
-      end
+        command = "codesign --force --sign '#{cert}'"
+        # Check to see if the entitlements passed in is a file or the XML
+        unless File.exists?(entitlements)
+          file = Tempfile.new('entitlements')
+          file.write(entitlements)
+          file.close
+          entitlements = file.path
+          command = command + " --entitlements #{entitlements}"
+        end
 
-      result = execute("codesign --force --sign '#{cert}' --entitlements #{entitlements} '#{app}'")
+        result = execute(command + " '#{app}'")
 
-      raise SigningCommandError.new(result.stderr) if result.exit != 0
+        raise SigningCommandError.new(result.stderr) if result.exit != 0
 
-      zip_app(app, original_app) if original_app
-    end
+        zip_app(app, original_app) if original_app
+      end
 
-    def self.zip_app(payload_path, ipa_path)
-      result = execute("cd #{File.dirname(payload_path)}; zip -r #{ipa_path} ../Payload ")
-      raise SigningCommandError.new(result.stderr) if result.exit != 0
+      def self.zip_app(payload_path, ipa_path)
+        result = execute("cd #{File.dirname(payload_path)}; zip -r #{ipa_path} ../Payload ")
+        raise SigningCommandError.new(result.stderr) if result.exit != 0
 
-      true
-    end
+        true
+      end
 
-    def self.get_signing_certs
-      result = execute('security find-identity -p codesigning -v')
+      def self.get_signing_certs
+        result = execute('security find-identity -p codesigning -v')
 
-      raise SigningCommandError.new(result.stderr) if result.exit != 0
+        raise SigningCommandError.new(result.stderr) if result.exit != 0
 
-      certs = []
-      result.stdout.split("\n").each do |line|
-        if /\)\s*(\S*)\s*"(.*)"/.match(line)
-          certs << { id: Regexp.last_match[1], name: Regexp.last_match[2] }
+        certs = []
+        result.stdout.split("\n").each do |line|
+          if /\)\s*(\S*)\s*"(.*)"/.match(line)
+            certs << { id: Regexp.last_match[1], name: Regexp.last_match[2] }
+          end
         end
+        certs
       end
-      certs
-    end
 
-    def self.get_entitlements(app_path, raw = false)
-      app_path = unpack_ipa(app_path) if is_ipa?(app_path)
-      result = execute("codesign -d --entitlements - #{app_path}")
+      def self.get_entitlements(app_path, raw = false)
+        app_path = unpack_ipa(app_path) if is_ipa?(app_path)
+        result = execute("codesign -d --entitlements - #{app_path}")
 
-      if result.exit != 0
-        raise SigningCommandError.new(result.stderr)
-      end
+        if result.exit != 0
+          raise SigningCommandError.new(result.stderr)
+        end
 
-      # Clean up the result as it occasionally contains invalid UTF-8 characters
-      xml = result.stdout.to_s.encode('UTF-8', 'UTF-8', invalid: :replace)
-      xml = xml[xml.index('<')..xml.length]
+        # Clean up the result as it occasionally contains invalid UTF-8 characters
+        xml = result.stdout.to_s.encode('UTF-8', 'UTF-8', invalid: :replace)
+        xml = xml[xml.index('<')..xml.length]
 
-      return xml if raw
-      entitlements = Plistutil.parse_xml(xml)
-      return entitlements
-    end
+        return xml if raw
+        entitlements = Plistutil.parse_xml(xml)
+        return entitlements
+      end
 
-    def self.enable_get_tasks(app_path)
-      entitlements = get_entitlements(app_path, raw: true)
+      def self.enable_get_tasks(app_path)
+        entitlements = get_entitlements(app_path, raw: true)
 
-      return entitlements if entitlements.scan(/<key>get-task-allow<\/key>\\n.*<true\/>/).count > 0
+        return entitlements if entitlements.scan(/<key>get-task-allow<\/key>\\n.*<true\/>/).count > 0
 
-      entitlements.gsub('<false/>', '<true/>') if entitlements.scan(/<key>get-task-allow<\/key>\\n.*<false\/>/)
+        entitlements.gsub('<false/>', '<true/>') if entitlements.scan(/<key>get-task-allow<\/key>\\n.*<false\/>/)
+      end
     end
-  end
 
-  # Signing error class
-  class SigningCommandError < StandardError
-    def initialize(msg)
-      super(msg)
+    # Signing error class
+    class SigningCommandError < StandardError
+      def initialize(msg)
+        super(msg)
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fruity_builder
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - BBC
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-19 00:00:00.000000000 Z
+date: 2016-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ox