deploygate 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ea4f6b63f5d815dfdafe48ffe77075788948750
-  data.tar.gz: 8b78a6d1b0349c865cebc44949ad246da681884f
+  metadata.gz: f0ca9d51938056afdd86e937f610767e6b06ac79
+  data.tar.gz: d14b7d8dc7432c667aeb9dddf8f7ac5f0cf8eb9a
 SHA512:
-  metadata.gz: 7f4f98f50124b312c8711f00edab761d7e7bb54ea1db50862186a142af7fabe1f7040aa7b69a2ac6f508dc7bcd18125a0bf818b29c2cd88e23e15c26c6408874
-  data.tar.gz: 9f5df21e0f83ff2d40c0324253c9ec50f0ebe1b0ddf6749005b2cc6a6bf972110b541a66130a93cdacbc09277c54d0b9649aeb10950e3a6fd838f4e5f2a90a29
+  metadata.gz: b3912ca85a734e6a69cef97d3f065140834e181cdfa83abb5350df2e638fdfd0c0dd2eb8b7c8ba9f26c97a8493fe3656b0fbb109eedd8f28b596efe1a97da712
+  data.tar.gz: 2c3fc20c52ed851af13ac4929898f9ec1ef2ab1cab22a7a35c69ed5c78b3b8bad1c29be40dd8cc77cac752968df8329eac74b9fec1bbf6852ab48b79d8601844

data/lib/deploygate/api/v1/push.rb

@@ -6,6 +6,7 @@ module DeployGate
 
         class << self
 
+          # @param [String] command
           # @param [String] file_path
           # @param [String] target_user
           # @param [String] token
@@ -14,12 +15,19 @@ module DeployGate
           # @param [Boolean] disable_notify
           # @yield Upload process block
           # @return [Hash]
-          def upload(file_path, target_user, token, message, distribution_key, disable_notify = false, &process_block)
+          def upload(command, file_path, target_user, token, message, distribution_key, disable_notify = false, &process_block)
             res = nil
+            env_ci = ENV['CI']
             open(file_path) do |file|
               res = Base.new(token).post(
                 sprintf(ENDPOINT, target_user),
-                { :file => file , :message => message, :distribution_key => distribution_key, :disable_notify => disable_notify ? 'yes' : 'no' }) { process_block.call unless process_block.nil? }
+                { :file => file ,
+                  :message => message,
+                  :distribution_key => distribution_key,
+                  :disable_notify => disable_notify ? 'yes' : 'no',
+                  :dg_command => command || '',
+                  :env_ci => env_ci
+                }) { process_block.call unless process_block.nil? }
             end
 
             upload_results = {

data/lib/deploygate/command_builder.rb

@@ -63,7 +63,7 @@ module DeployGate
         c.option '--open', I18n.t('command_builder.deploy.open')
         c.option '--disable_notify', I18n.t('command_builder.deploy.disable_notify')
         c.action do |args, options|
-          options.default :message => '', :user => nil, :open => false, 'disable_notify' => false
+          options.default :message => '', :user => nil, :open => false, 'disable_notify' => false, :command => nil
           begin
             Commands::Deploy.run(args, options)
           rescue => e
@@ -83,7 +83,7 @@ module DeployGate
         c.option '--distribution-key STRING', String, I18n.t('command_builder.add_devices.distribution_key')
         c.option '--server', I18n.t('command_builder.add_devices.server.description')
         c.action do |args, options|
-          options.default :user => nil, :server => false
+          options.default :user => nil, :server => false, :command => 'add_devices'
           begin
             Commands::AddDevices.run(args, options)
           rescue => e

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

@@ -2,6 +2,8 @@ module DeployGate
   module Commands
     module Deploy
       class Build
+        COMMAND = 'build'
+
         class << self
 
           # @param [Array] args
@@ -11,6 +13,9 @@ module DeployGate
             # android/ios build
             work_dir = args.empty? ? Dir.pwd : args.first
 
+            # override options command
+            options.command = options.command || COMMAND
+
             if DeployGate::Project.ios?(work_dir)
               root_path = DeployGate::Xcode::Ios.project_root_path(work_dir)
               workspaces = DeployGate::Xcode::Ios.find_workspaces(root_path)

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

@@ -3,6 +3,7 @@ module DeployGate
     module Deploy
       class Push
         BASE_URL = 'https://deploygate.com'
+        COMMAND  = 'push'
 
         class << self
 
@@ -21,12 +22,13 @@ module DeployGate
             distribution_key = options.distribution_key
             open             = options.open
             disable_notify   = options.disable_notify
+            command          = options.command || COMMAND
             file_path        = args.first
 
             data = nil
             print I18n.t('commands.deploy.push.upload.loading', owner: owner)
             begin
-              data = DeployGate::Deploy.push(file_path, owner, message, distribution_key, disable_notify) {
+              data = DeployGate::Deploy.push(command, file_path, owner, message, distribution_key, disable_notify) {
                 print '.'
                 sleep 0.2
               }

data/lib/deploygate/deploy.rb

@@ -9,6 +9,7 @@ module DeployGate
 
     class << self
 
+      # @param [String] command
       # @param [String] file_path
       # @param [String] target_user
       # @param [String] message
@@ -16,15 +17,14 @@ module DeployGate
       # @param [Boolean] disable_notify
       # @yield Upload process block
       # @return [Hash]
-      def push(file_path, target_user, message, distribution_key, disable_notify = false, &process_block)
+      def push(command, file_path, target_user, message, distribution_key, disable_notify = false, &process_block)
         raise NotFileExistError, 'Target file is not found' if file_path.nil? || !File.exist?(file_path)
 
         session = DeployGate::Session.new()
         raise NotLoginError, 'Must login user' unless session.login?
         token = session.token
 
-
-        data = API::V1::Push.upload(file_path, target_user, token, message, distribution_key || '', disable_notify) { process_block.call unless process_block.nil? }
+        data = API::V1::Push.upload(command, file_path, target_user, token, message, distribution_key || '', disable_notify) { process_block.call unless process_block.nil? }
         raise UploadError, data[:message] if data[:error]
 
         data

data/lib/deploygate/version.rb

@@ -1,3 +1,3 @@
 module DeployGate
-  VERSION = '0.5.1'
+  VERSION = '0.5.2'
 end

data/spec/deploygate/deploy_spec.rb

@@ -5,13 +5,13 @@ describe DeployGate::Deploy do
         allow_any_instance_of(DeployGate::Session).to receive(:login?) { false }
 
         expect {
-          DeployGate::Deploy.push(test_file_path, 'test', 'message', nil)
+          DeployGate::Deploy.push('push', test_file_path, 'test', 'message', nil)
         }.to raise_error DeployGate::Deploy::NotLoginError
       end
 
       it "NotFileExistError" do
         expect {
-          DeployGate::Deploy.push('no_file_path', 'test', 'message', nil)
+          DeployGate::Deploy.push('push', 'no_file_path', 'test', 'message', nil)
         }.to raise_error DeployGate::Deploy::NotFileExistError
       end
 
@@ -20,7 +20,7 @@ describe DeployGate::Deploy do
         allow(DeployGate::API::V1::Push).to receive(:upload).and_return({:error => true, :message => 'error message'})
 
         expect {
-          DeployGate::Deploy.push(test_file_path, 'test', 'message', nil)
+          DeployGate::Deploy.push('push', test_file_path, 'test', 'message', nil)
         }.to raise_error DeployGate::Deploy::UploadError
       end
     end
@@ -31,7 +31,7 @@ describe DeployGate::Deploy do
         allow_any_instance_of(DeployGate::Session).to receive(:login?) { true }
 
         expect {
-          DeployGate::Deploy.push(test_file_path, 'test', 'message', nil)
+          DeployGate::Deploy.push('push', test_file_path, 'test', 'message', nil)
         }.not_to raise_error
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deploygate
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - deploygate
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-31 00:00:00.000000000 Z
+date: 2017-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json