deploygate 0.2.0 → 0.2.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDIxOWM0M2U2OThlNmZlYjVmNTMwMmE4MTliNWNhNGRmZjRiN2E1OQ==
+    ZGFkNTU4ZTMxMzRiZDY2NjFmMjcwMDc0YWViODBjNzMyYWRiNTg1OQ==
   data.tar.gz: !binary |-
-    NGQyZThlNGQ5ZjQyYzA2ZmNlODhiMTk1NzdhZWVkZTZkNzkzMWU3MQ==
+    NWQ3OWI4YjVjYTRmMTdiN2NlZGMzM2FhNGNhYThiM2YxMTJlYjE2Mg==
 SHA512:
   metadata.gz: !binary |-
-    NWIyOGU4YjFhMTg4NTU4MjRiYTA1M2Q0ZDQ3ODU2OThmODI0YTI1NTE4MDNk
-    MDZmY2JiYzQ2ZDFmNzUwYmI5MmNmOWUzMDI3MDZlYzE2MGFkMDlhYmJhNmNm
-    M2M2NDBmNWViNzczOTg5NjIzNDU5ZDllZmMyODkzOTQ2MTExZjA=
+    Yzg4MmY0ZTQ2MTQzMzEzYzlkNmI5OWUyZjkzOWE1NGJmNzQ4MzRkMDZiZGU3
+    OGVhZmVkYTM3MjdjMTQ5NTk0N2FhMGY0NzgzYzY0MGUzNmQwM2YxYTllMGE2
+    NTM5ZTRjMTAxYzA3MDZjZGYyMzJmMDU0ZGE0MDQ1ZDA1ZjIxZjE=
   data.tar.gz: !binary |-
-    ZjA0YTI4MTU4ZGY2OTAxMDM5NGRhZDJlZWVhMzc4MDI1MzdmMzZjYjM4N2Jm
-    OGIyY2YyNGM2M2JhOThhOTJiMTY0MmI4ZTJhYzVmNDZmMGM2NjFmYzFmYjRm
-    YzU0NGViZWQ4OTFiNTdjMDMxYTlmYTQ5YmZiNDZlMDRhMWI5MTc=
+    NTA4OGNlMmZmM2NkMGJhZmI0ZjMzMGMwNTIxNTcyMjA0YzMzOGIxODY3OGJh
+    YzQ2OTFiZjZkY2ZmMjRkYjkzMzg2Mjk5NDVkMjI5ZjE1ZDU1ZjU0ZjM0ZGMz
+    MWEyMTc3OTEzNTRlYzJiOWVlN2YzYjlkOWYyZWNlNzA5YWEwZGY=

data/config/locales/en.yml

@@ -40,6 +40,7 @@ en:
       # It is recommended to use the latest version.
       # You can update it by running 'gem update %{gem_name}'.
       #################################################################
+    not_internet_connection_error: 'Error: Not internet connection. Please by connecting to the internet'
   commands:
     deploy:
       build:
@@ -145,6 +146,7 @@ en:
         finish: 'Finish cleaning local Provisionig Profiles'
     analyze:
       target_bundle_identifier:
+        bundle_identifier_different: 'This xcode project Bundle Identifier has been two registered. "%{plist_id}" and "%{product_id}"'
         prompt: |
           Please input your app bundle identifier
           Example: com.example.ios

data/deploygate.gemspec

@@ -33,11 +33,12 @@ POST_INSTALL_MESSAGE
   spec.add_dependency 'i18n'
   spec.add_dependency 'launchy'
   spec.add_dependency 'locale'
+  spec.add_dependency 'net-ping'
 
   # ios build
-  spec.add_dependency 'gym', '~> 1.4.0'
-  spec.add_dependency 'spaceship', '~> 0.19.0'
-  spec.add_dependency 'sigh', '~> 1.2.2'
+  spec.add_dependency 'gym', '~> 1.6.2'
+  spec.add_dependency 'spaceship', '~> 0.23.0'
+  spec.add_dependency 'sigh', '~> 1.4.1'
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/lib/deploygate/command_builder.rb

@@ -3,20 +3,37 @@ module DeployGate
     include Commander::Methods
     attr_reader :arguments
 
+    class NotInternetConnectionError < DeployGate::NotIssueError
+    end
+
+    PING_URL = 'https://deploygate.com'
+
     LOGIN       = 'login'
     LOGOUT      = 'logout'
     DEPLOY      = 'deploy'
     ADD_DEVICES = 'add-devices'
     CONFIG      = 'config'
 
-    def run
+    def setup
+      # set Ctrl-C trap
       Signal.trap(:INT){
         puts ''
         exit 0
       }
 
+      # check internet connection
+      unless internet_connection?
+        STDERR.puts HighLine.color(I18n.t('command_builder.not_internet_connection_error'), HighLine::RED)
+        exit
+      end
+
+      # check update
       GithubIssueRequest::Url.config('deploygate', 'deploygate-cli')
       check_update()
+    end
+
+    def run
+      setup()
 
       program :name, I18n.t('command_builder.name')
       program :version,  VERSION
@@ -209,5 +226,10 @@ EOF
       STDERR.puts HighLine.color(I18n.t('command_builder.show_update_message', gem_name: gem_name, latest_version: latest_version, current_version: current_version), HighLine::YELLOW)
       STDERR.puts ''
     end
+
+    # @return [Boolean]
+    def internet_connection?
+      Net::Ping::HTTP.new(PING_URL).ping?
+    end
   end
 end

data/lib/deploygate/commands/deploy/push.rb

@@ -54,7 +54,7 @@ module DeployGate
                         revision: data[:revision],
                         web_url: data[:web_url])
             if((open || data[:revision] == 1) && openable?)
-              system "open #{data[:web_url]}"
+              Launchy.open(data[:web_url])
             end
           end
 

data/lib/deploygate/session.rb

@@ -5,6 +5,11 @@ module DeployGate
 
     attr_reader :name, :token
 
+    module ENVKey
+      DG_USER_NAME = 'DG_USER_NAME'
+      DG_TOKEN = 'DG_TOKEN'
+    end
+
     @@login = nil
 
     # @return [DeployGate::Session]
@@ -55,11 +60,21 @@ module DeployGate
 
     # @return [void]
     def load_setting
+      return if load_env
       return unless Config::Credential.exist?
       settings = Config::Credential.read
+
       @name = settings['name']
       @token = settings['token']
     end
 
+    # @return [Boolean]
+    def load_env
+      @name = ENV[ENVKey::DG_USER_NAME]
+      @token = ENV[ENVKey::DG_TOKEN]
+
+      @name.present? && @token.present?
+    end
+
   end
 end

data/lib/deploygate/version.rb

@@ -1,3 +1,3 @@
 module DeployGate
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/lib/deploygate/xcode/analyze.rb

@@ -6,6 +6,9 @@ module DeployGate
       BASE_WORK_DIR_NAME = 'project.xcworkspace'
       BUILD_CONFIGRATION = 'Release'
 
+      class BundleIdentifierDifferentError < DeployGate::NotIssueError
+      end
+
       # @param [Array] workspaces
       # @return [DeployGate::Xcode::Analyze]
       def initialize(workspaces)
@@ -29,13 +32,45 @@ module DeployGate
       def target_bundle_identifier
         begin
           product_name = target_product_name
-          identifier = target_build_configration.build_settings['PRODUCT_BUNDLE_IDENTIFIER']
-          identifier.gsub!(/\$\(PRODUCT_NAME:.+\)/, product_name)
-        rescue
+          product_bundle_identifier = target_build_configration.build_settings['PRODUCT_BUNDLE_IDENTIFIER']
+          product_bundle_identifier = convert_bundle_identifier(product_bundle_identifier)
+
+          info_plist_file_path = target_build_configration.build_settings['INFOPLIST_FILE']
+          root_path = DeployGate::Xcode::Ios.project_root_path(@scheme_workspace)
+          plist_bundle_identifier =
+              File.open(File.join(root_path, info_plist_file_path)) do |file|
+                plist = Plist.parse_xml file.read
+                plist['CFBundleIdentifier']
+              end
+          plist_bundle_identifier = convert_bundle_identifier(plist_bundle_identifier)
+
+          if product_bundle_identifier != plist_bundle_identifier
+            raise BundleIdentifierDifferentError,
+                  I18n.t('xcode.analyze.target_bundle_identifier.bundle_identifier_different', plist_id: plist_bundle_identifier, product_id: product_bundle_identifier)
+          end
+
+          bundle_identifier = product_bundle_identifier
+          bundle_identifier.gsub!(/\$\(PRODUCT_NAME:.+\)/, product_name)
+        rescue BundleIdentifierDifferentError => e
+          raise e
+        rescue => e
           cli = HighLine.new
           puts I18n.t('xcode.analyze.target_bundle_identifier.prompt')
-          identifier = cli.ask(I18n.t('xcode.analyze.target_bundle_identifier.ask')) { |q| q.validate = /^(\w+)\.(\w+).*\w$/ }
+          bundle_identifier = cli.ask(I18n.t('xcode.analyze.target_bundle_identifier.ask')) { |q| q.validate = /^(\w+)\.(\w+).*\w$/ }
+        end
+
+        bundle_identifier
+      end
+
+      # @param [String] bundle_identifier
+      # @return [String]
+      def convert_bundle_identifier(bundle_identifier)
+        identifier = bundle_identifier
+        if match = bundle_identifier.match(/\$\((.+)\)/)
+          custom_id = match[1]
+          identifier = target_build_configration.build_settings[custom_id]
         end
+        identifier = convert_bundle_identifier(identifier) if bundle_identifier.match(/\$\((.+)\)/)
 
         identifier
       end

data/lib/deploygate/xcode/export.rb

@@ -39,15 +39,16 @@ module DeployGate
           profiles.reject! {|profile| profile['UUID'] != uuid} unless uuid.nil?
 
           profiles.each do |profile|
+            next if DateTime.now >= profile['ExpirationDate'] || !installed_certificate?(profile['Path'])
+
             entities = profile['Entitlements']
             unless entities['get-task-allow']
               team_id = entities['com.apple.developer.team-identifier']
               application_id = entities['application-identifier']
               application_id.slice!(/^#{team_id}\./)
               application_id = '.' + application_id if application_id == '*'
-              if bundle_identifier.match(application_id) &&
-                  DateTime.now < profile['ExpirationDate'] &&
-                  installed_certificate?(profile['Path'])
+              if match = bundle_identifier.match(application_id)
+                next if match[0] != bundle_identifier
 
                 local_teams.add(team_id, profile['TeamName'], profile['Path'])
               end

data/lib/deploygate.rb

@@ -18,6 +18,7 @@ require "open-uri"
 require "rexml/document"
 require "launchy"
 require "webrick"
+require "net/ping"
 
 require "i18n"
 I18n.load_path = Dir[File.join(File.dirname(__FILE__), '../config/locales/*.yml')]

data/spec/deploygate/session_spec.rb

@@ -1,4 +1,41 @@
 describe DeployGate::Session do
+  describe "use env" do
+    let(:name) { 'name' }
+    let(:env_name) { 'env_name' }
+    let(:token) { 'token' }
+    let(:env_token) { 'env_token' }
+
+    it "not set env" do
+      ENV[DeployGate::Session::ENVKey::DG_USER_NAME] = nil
+      ENV[DeployGate::Session::ENVKey::DG_TOKEN] = nil
+
+      DeployGate::Session.save(name, token)
+      session = DeployGate::Session.new
+      expect(session.name).to eq name
+      expect(session.token).to eq token
+    end
+
+    it "set env blank" do
+      ENV[DeployGate::Session::ENVKey::DG_USER_NAME] = ''
+      ENV[DeployGate::Session::ENVKey::DG_TOKEN] = ''
+
+      DeployGate::Session.save(name, token)
+      session = DeployGate::Session.new
+      expect(session.name).to eq name
+      expect(session.token).to eq token
+    end
+
+    it "set env" do
+      ENV[DeployGate::Session::ENVKey::DG_USER_NAME] = env_name
+      ENV[DeployGate::Session::ENVKey::DG_TOKEN] = env_token
+
+      DeployGate::Session.save(name, token)
+      session = DeployGate::Session.new
+      expect(session.name).to eq env_name
+      expect(session.token).to eq env_token
+    end
+  end
+
   describe "#login?" do
     it "call check api" do
       call_check = false

data/spec/spec_helper.rb

@@ -7,8 +7,6 @@ RSpec.configure do |config|
   config.before :each do
     # config file mock
     allow(DeployGate::Config::Credential).to receive(:file_path).and_return(File.join(SPEC_FILE_PATH, 'test_files/.dg/credentials'))
-    # config dir mock
-    allow(FileUtils).to receive(:mkdir_p) {}
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deploygate
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - deploygate
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-15 00:00:00.000000000 Z
+date: 2016-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -192,48 +192,62 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: net-ping
+  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: gym
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.6.2
 - !ruby/object:Gem::Dependency
   name: spaceship
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.23.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.23.0
 - !ruby/object:Gem::Dependency
   name: sigh
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: 1.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: 1.4.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement