pem 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19138a0a09162ae6c18b6a176bdeb92f1b1021b6
-  data.tar.gz: 0814e925bb65d0defb24b03ab3056415ba1e3c88
+  metadata.gz: ac3066ee25047a3d83151ec0832384b64d004b51
+  data.tar.gz: 55e0c443e90906bd180e20d11bab3291c4560d9a
 SHA512:
-  metadata.gz: ac61aa4ce7cfd887d912936decfeaf2d335535e2b9219d839b6460b4fa75a55bdaa84713d71aad265ae2375cccc2d93399d465f45f4ec6f66fba14571ab0968a
-  data.tar.gz: e86ff985ea138a13af7015c0b16d0a824cac035a7b80fd6056352ceb1c2410b4e12b80beaed334db0403dba9423188f30514fd69f2410c604ee29d6a7937e011
+  metadata.gz: fb43e922dc627c97cba4805a06df6395de73e4afba158d06515d9501e8cde1019dc6aaf50085ce8f205bd544bf8bd14b8e8ec307530b5eb37e7033d5cb75938b
+  data.tar.gz: a690f2b0e4d4c18a9d396b6b7d003ec76f05f25bf52e7bbe3ea41bc1bbe87b95ce31eb9cc45754804e8a8abfb0e86b4bc0b51473c01a0c4c4f23e6600b9e4b14

data/README.md

@@ -50,6 +50,8 @@ Alexander Schuch ([@schuchalexander](https://twitter.com/schuchalexander)) who a
 
 -------
 
+<h5 align="center"><code>PEM</code> is part of <a href="http://fastlane.tools">fastlane</a>: connect all deployment tools into one streamlined workflow.</h5>
+
 # Features
 Well, it's actually just one: Generate the ```pem``` file for your server.
 
@@ -65,8 +67,6 @@ Make sure, you have the latest version of the Xcode command line tools installed
 
     xcode-select --install
 
-If you don't already have homebrew installed, [install it here](http://brew.sh/).
-
 # Usage
 
     pem

data/lib/pem.rb

@@ -1,19 +1,18 @@
-require 'json'
 require 'pem/version'
-require 'pem/helper'
 require 'pem/dependency_checker'
 require 'pem/developer_center'
-require 'pem/update_checker'
 require 'pem/cert_manager'
 require 'pem/signing_request'
 
-# Third Party code
-require 'phantomjs/poltergeist'
-require 'colored'
+require 'fastlane_core'
 
 module PEM
   TMP_FOLDER = "/tmp/PEM/"
 
-  PEM::UpdateChecker.verify_latest_version
+  ENV['FASTLANE_TEAM_ID'] ||= ENV["PEM_TEAM_ID"]
+
+  Helper = FastlaneCore::Helper # you gotta love Ruby: Helper.* should use the Helper class contained in FastlaneCore
+
+  FastlaneCore::UpdateChecker.verify_latest_version('pem', PEM::VERSION)
   DependencyChecker.check_dependencies
 end

data/lib/pem/cert_manager.rb

@@ -7,7 +7,7 @@ module PEM
 
       Helper.log.info "Refreshing push notification profiles for app '#{app_identifier}'"
 
-      dev = PEM::DeveloperCenter.new
+      dev = FastlaneCore::DeveloperCenter.new
 
       cert_file = dev.fetch_cer_file(app_identifier, production)
       rsa_file = File.join(TMP_FOLDER, 'private_key.key')

data/lib/pem/developer_center.rb

@@ -1,160 +1,10 @@
-require 'credentials_manager/password_manager'
-require 'open-uri'
-require 'openssl'
+require 'fastlane_core/developer_center/developer_center'
 
-require 'capybara'
-require 'capybara/poltergeist'
-require 'phantomjs/poltergeist'
-
-module PEM
+module FastlaneCore
   class DeveloperCenter
-    # This error occurs only if there is something wrong with the given login data
-    class DeveloperCenterLoginError < StandardError 
-    end
-
-    # This error can occur for many reaons. It is
-    # usually raised when a UI element could not be found
-    class DeveloperCenterGeneralError < StandardError
-    end
-
-    include Capybara::DSL
-
-    DEVELOPER_CENTER_URL = "https://developer.apple.com/devcenter/ios/index.action"
     APP_IDS_URL = "https://developer.apple.com/account/ios/identifiers/bundle/bundleList.action"
 
-    # Strings
-    PRODUCTION_SSL_CERTIFICATE_TITLE = "Production SSL Certificate"
-    DEVELOPMENT_SSL_CERTIFICATE_TITLE = "Development SSL Certificate"
-
-    def initialize
-      FileUtils.mkdir_p TMP_FOLDER
-      
-      Capybara.run_server = false
-      Capybara.default_driver = :poltergeist
-      Capybara.javascript_driver = :poltergeist
-      Capybara.current_driver = :poltergeist
-      Capybara.app_host = DEVELOPER_CENTER_URL
-
-      # Since Apple has some SSL errors, we have to configure the client properly:
-      # https://github.com/ariya/phantomjs/issues/11239
-      Capybara.register_driver :poltergeist do |a|
-        conf = ['--debug=no', '--ignore-ssl-errors=yes', '--ssl-protocol=TLSv1']
-        Capybara::Poltergeist::Driver.new(a, {
-          phantomjs: Phantomjs.path,
-          phantomjs_options: conf,
-          phantomjs_logger: File.open("#{TMP_FOLDER}/poltergeist_log.txt", "a"),
-          js_errors: false
-        })
-      end
-
-      page.driver.headers = { "Accept-Language" => "en" }
-
-      self.login
-    end
-
-    # Loggs in a user with the given login data on the Dev Center Frontend.
-    # You don't need to pass a username and password. It will
-    # Automatically be fetched using the {CredentialsManager::PasswordManager}.
-    # This method will also automatically be called when triggering other 
-    # actions like {#open_app_page}
-    # @param user (String) (optional) The username/email address
-    # @param password (String) (optional) The password
-    # @return (bool) true if everything worked fine
-    # @raise [DeveloperCenterGeneralError] General error while executing 
-    #  this action
-    # @raise [DeveloperCenterLoginError] Login data is wrong
-    def login(user = nil, password = nil)
-      begin
-        Helper.log.info "Login into iOS Developer Center"
-
-        user ||= CredentialsManager::PasswordManager.shared_manager.username
-        password ||= CredentialsManager::PasswordManager.shared_manager.password
-
-        result = visit APP_IDS_URL
-        raise "Could not open Developer Center" unless result['status'] == 'success'
-
-        wait_for_elements(".button.blue").first.click
-
-        (wait_for_elements('#accountpassword') rescue nil) # when the user is already logged in, this will raise an exception
-
-        if page.has_content?"My Apps"
-          # Already logged in
-          return true
-        end
-
-        fill_in "accountname", with: user
-        fill_in "accountpassword", with: password
-        
-        all(".button.large.blue.signin-button").first.click
-
-        begin
-          if page.has_content?"Select Team" # If the user is not on multiple teams
-            select_team
-          end
-        rescue => ex
-          Helper.log.debug ex
-          raise DeveloperCenterLoginError.new("Error loggin in user #{user}. User is on multiple teams and we were unable to correctly retrieve them.")
-        end
-
-        begin
-          visit APP_IDS_URL
-          wait_for_elements('.ios.bundles.gridList')
-        rescue => ex
-          Helper.log.debug ex
-          raise DeveloperCenterLoginError.new("Error logging in user #{user} with the given password. Make sure you entered them correctly.")
-        end
-
-        Helper.log.info "Login successful"
-
-        true
-      rescue => ex
-        error_occured(ex)
-      end
-    end
-
-    def select_team
-      team_id = ENV["PEM_TEAM_ID"]
-      team_id = nil if team_id.to_s.length == 0
-
-      unless team_id
-        Helper.log.info "You can store you preferred team using the environment variable `PEM_TEAM_ID`".green
-        Helper.log.info "Your ID belongs to the following teams:".green
-      end
-      
-      available_options = []
-
-      teams = find("div.input").all('.team-value') # Grab all the teams data
-      teams.each_with_index do |val, index|
-        current_team_id = '"' + val.find("input").value + '"'
-        team_text = val.find(".label-primary").text
-        description_text = val.find(".label-secondary").text
-        description_text = "(#{description_text})" unless description_text.empty? # Include the team description if any
-        index_text = (index + 1).to_s + "."
-
-        available_options << [index_text, current_team_id, team_text, description_text].join(" ")
-      end
-
-      unless team_id
-        puts available_options.join("\n").green
-        team_index = ask("Please select the team number you would like to access: ".green)
-        team_id = teams[team_index.to_i - 1].find(".radio").value
-      end
-
-      team_button = first(:xpath, "//input[@type='radio' and @value='#{team_id}']") # Select the desired team
-      if team_button
-        team_button.click
-      else
-        Helper.log.fatal "Could not find given Team. Available options: ".red
-        puts available_options.join("\n").yellow
-        raise DeveloperCenterLoginError.new("Error finding given team #{team_id}.".red)
-      end
-
-      all(".button.large.blue.submit").first.click
-
-      result = visit APP_IDS_URL
-      raise "Could not open Developer Center" unless result['status'] == 'success'
-    end
-
+    
     # This method will enable push for the given app
     # and download the cer file in any case, no matter if it existed before or not
     # @return the path to the push file
@@ -187,6 +37,10 @@ module PEM
           visit APP_IDS_URL
           sleep 5
 
+          wait_for_elements(".toolbar-button.search").first.click
+          fill_in "bundle-list-search", with: app_identifier
+          sleep 5
+
           apps = all(:xpath, "//td[@title='#{app_identifier}']")
           if apps.count == 1
             apps.first.click
@@ -258,43 +112,12 @@ module PEM
           raise "Can't write to #{TMP_FOLDER}"
         end
         
-        Helper.log.info "Successfully downloaded latest .cer file."
+        Helper.log.info "Successfully downloaded latest .cer file to '#{path}'".green
         return path
       end
 
-
-    private
       def click_next
         wait_for_elements('.button.small.blue.right.submit').last.click
       end
-
-      def error_occured(ex)
-        snap
-        raise ex # re-raise the error after saving the snapshot
-      end
-
-      def snap
-        path = "Error#{Time.now.to_i}.png"
-        save_screenshot(path, :full => true)
-        system("open '#{path}'")
-      end
-
-      def wait_for_elements(name)
-        counter = 0
-        results = all(name)
-        while results.count == 0      
-          # Helper.log.debug "Waiting for #{name}"
-          sleep 0.2
-
-          results = all(name)
-
-          counter += 1
-          if counter > 100
-            Helper.log.debug caller
-            raise DeveloperCenterGeneralError.new("Couldn't find element '#{name}' after waiting for quite some time")
-          end
-        end
-        return results
-      end
   end
 end

data/lib/pem/version.rb

@@ -1,3 +1,3 @@
 module PEM
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: pem
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-12 00:00:00.000000000 Z
+date: 2015-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: json
+  name: fastlane_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -24,104 +24,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: highline
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.6.21
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.6.21
-- !ruby/object:Gem::Dependency
-  name: colored
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: commander
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 4.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 4.2.0
-- !ruby/object:Gem::Dependency
-  name: credentials_manager
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: phantomjs
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.9.8
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.9.8
-- !ruby/object:Gem::Dependency
-  name: capybara
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.4.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.4.3
-- !ruby/object:Gem::Dependency
-  name: poltergeist
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.5.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -235,9 +137,7 @@ files:
 - lib/pem/cert_manager.rb
 - lib/pem/dependency_checker.rb
 - lib/pem/developer_center.rb
-- lib/pem/helper.rb
 - lib/pem/signing_request.rb
-- lib/pem/update_checker.rb
 - lib/pem/version.rb
 homepage: http://fastlane.tools
 licenses:

data/lib/pem/helper.rb

@@ -1,49 +0,0 @@
-require 'logger'
-
-module PEM
-  module Helper
-
-    # Logging happens using this method
-    def self.log
-      if is_test?
-        @@log ||= Logger.new(nil) # don't show any logs when running tests
-      else
-        @@log ||= Logger.new(STDOUT)
-      end
-
-      @@log.formatter = proc do |severity, datetime, progname, msg|
-        string = "#{severity} [#{datetime.strftime('%Y-%m-%d %H:%M:%S.%2N')}]: "
-        second = "#{msg}\n"
-
-        if severity == "DEBUG"
-          string = string.magenta
-        elsif severity == "INFO"
-          string = string.white
-        elsif severity == "WARN"
-          string = string.yellow
-        elsif severity == "ERROR"
-          string = string.red
-        elsif severity == "FATAL"
-          string = string.red.bold
-        end
-
-
-        [string, second].join("")
-      end
-
-      @@log
-    end
-
-    # @return true if the currently running program is a unit test
-    def self.is_test?
-      defined?SpecHelper
-    end
-
-    # @return the full path to the Xcode developer tools of the currently
-    #  running system
-    def self.xcode_path
-      return "" if self.is_test? and not OS.mac?
-      `xcode-select -p`.gsub("\n", '') + "/"
-    end
-  end
-end

data/lib/pem/update_checker.rb

@@ -1,44 +0,0 @@
-require 'open-uri'
-
-module PEM
-  # Verifies, the user runs the latest version of this gem
-  class UpdateChecker
-    # This method will check if the latest version is installed and show a warning if that's not the case
-    def self.verify_latest_version
-      if self.update_available?
-        v = fetch_latest
-        puts '#######################################################################'.green
-        puts "# PEM #{v} is available.".green
-        puts "# It is recommended to use the latest version.".green
-        puts "# Update using '(sudo) gem update PEM'.".green
-        puts "# To see what's new, open https://github.com/KrauseFx/PEM/releases.".green
-        puts '#######################################################################'.green
-        return true
-      end
-      false
-    end
-
-    # Is a new official release available (this does not include pre-releases)
-    def self.update_available?
-      begin
-        latest = fetch_latest
-        if latest and Gem::Version.new(latest) > Gem::Version.new(current_version)
-          return true
-        end
-      rescue => ex
-        Helper.log.error("Could not check if 'PEM' is up to date.")
-      end
-      return false
-    end
-
-    # The currently used version of this gem
-    def self.current_version
-      PEM::VERSION
-    end
-
-    private
-      def self.fetch_latest
-        JSON.parse(open("http://rubygems.org/api/v1/gems/pem.json").read)["version"]
-      end
-  end
-end