flow-cli 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2fa6031aa449ee4371cfa829a9935792127aa99
-  data.tar.gz: 4ae2ae1777e0a4b18f3b37e4534a561bcbf831d2
+  metadata.gz: 39618a37200754a1da9175cdc5b385f5c98db0c4
+  data.tar.gz: 25601c88ee90747b4558c48b3e934df7beef8491
 SHA512:
-  metadata.gz: d0ecd916f4dbb0a6c459d8270f0137de90d41e6f171edaa1aa33c14c59b9d62e31e1b02ab568eb943c3de5818ec814286d5c198e9cd9e944b4d4c0b3b6c3e983
-  data.tar.gz: 5de248002899ab72f88af68ba13fda40a2ded7250ccfcc3bd7091d75ff15db68b31a56bf322e4b2532a62fbbfa434cedf1a67aa3a7acf83408b09add58b3a0d3
+  metadata.gz: 08aa0177b1bb2f3b327d39150458cd87e5e32779a82b4530f222e39d65bcae4dcc624b9c62cddccc3735dc4739e6529abd9efc6a5378979d7829ea6cac9985ad
+  data.tar.gz: e82b9396481f479325eeb1085d52b8ffdf75f4147b8d39f631667725b6bc3c802fcc65f282fdd28108fd142f4176385441775dabd08d939cb6063299ab6bf8f5

data/exe/flow-cli

@@ -2,4 +2,8 @@
 
 require_relative '../lib/flow/cli'
 
+begin
 Flow::Cli::CmdManager.start(ARGV)
+rescue TTY::Prompt::Reader::InputInterrupt
+  puts "canceled..."
+end

data/flow-cli.gemspec

@@ -32,6 +32,7 @@ Gem::Specification.new do |spec|
  ****************************************************
  这是 flow.ci CLI 的早期版本，暂时只支持 ios 项目
 
+0.0.4 版本修正 在执行一些remote 指令，如果没登录，会报错的问题 另附增加 remote reset 指令
 0.0.3 版本新增 flow-cli remote 系列指令，支持传证书，传provisions 文件
 
   )

data/lib/flow/cli/cmd_manager.rb

@@ -12,7 +12,6 @@ module Flow::Cli
       @error    = @pastel.red.bold.detach
       @warning  = @pastel.yellow.detach
       @db_manager = Utils::DbManager
-      @api_manager = Utils::FlowApiManager.load_from_db
     end
 
     desc "remote ...ARGS", "manage flow ci"

data/lib/flow/cli/commands/remote.rb

@@ -1,18 +1,19 @@
 require 'yaml'
+require 'byebug'
 require 'tty'
 require 'thor'
 
 module Flow::Cli
   module Commands
     class Remote < Thor
-      def initialize(*args)
+      def initialize(*args, &proc)
         super(*args)
         @prompt = TTY::Prompt.new
         @pastel = Pastel.new
-        @error    = @pastel.red.bold.detach
-        @warning  = @pastel.yellow.detach
+        @warning = @pastel.yellow.detach
+        @error = @pastel.red.bold.detach
         @db_manager = Utils::DbManager
-        @api_manager = Utils::FlowApiManager.load_from_db
+        @api_manager = Utils::FlowApiManager.load_from_db(&proc)
       end
 
       desc "login", "bind flow ci account to flow cli."
@@ -23,9 +24,15 @@ module Flow::Cli
         puts "login success"
       end
 
+      desc "reset", "reset flow api info data"
+      def reset
+        @db_manager.overide_save({})
+        puts "reset success..."
+      end
+
       desc "project_init", "set a project from flow ci to operation"
       def project_init
-        projects = @api_manager.fetch_projects
+        projects = current_api_manager.fetch_projects
         begin
           file_origin = `git remote -v`.to_s.match("git.*.git").first
         rescue
@@ -39,7 +46,7 @@ module Flow::Cli
 
         @db_manager.save_attribute(:current_project_id, current_project_id)
 
-        flows = @api_manager.fetch_flows(current_project_id)
+        flows = current_api_manager.fetch_flows(current_project_id)
 
         current_flow_id = if flows.count == 1
                             flows.first[:id]
@@ -54,48 +61,69 @@ module Flow::Cli
 
       desc "upload_p12 FILE_PATH [p12 password]", "upload_p12"
       def upload_p12(file_path, password = nil)
+        choosed_project_check
         basename = File.basename file_path
         project_init unless @db_manager.read_attribute(:current_flow_id)
 
-        api_p12s = @api_manager.load_p12s(@db_manager.read_attribute(:current_flow_id))
+        api_p12s = current_api_manager.load_p12s(@db_manager.read_attribute(:current_flow_id))
         old_p12 = api_p12s.find { |p12| p12[:filename] == basename }
         unless old_p12.nil?
           if @prompt.yes? "found a same name file, override?"
-            @api_manager.delete_p12(old_p12[:id], @db_manager.read_attribute(:current_flow_id))
+            current_api_manager.delete_p12(old_p12[:id], @db_manager.read_attribute(:current_flow_id))
           else
             return puts "canceled.."
           end
         end
-        @api_manager.upload_p12(@db_manager.read_attribute(:current_flow_id), file_path, password)
+        current_api_manager.upload_p12(@db_manager.read_attribute(:current_flow_id), file_path, password)
         puts "uploaded."
       end
 
       desc "list_p12s", "list_p12s"
       def list_p12s
-        puts @api_manager.load_p12s(@db_manager.read_attribute(:current_flow_id))
+        choosed_project_check
+        puts current_api_manager.load_p12s(@db_manager.read_attribute(:current_flow_id))
       end
 
       desc "upload_provision", "upload_provision"
       def upload_provision(file_path)
+        choosed_project_check
         basename = File.basename file_path
         project_init unless @db_manager.read_attribute(:current_flow_id)
 
-        api_provisions = @api_manager.load_provisions(@db_manager.read_attribute(:current_flow_id))
+        api_provisions = current_api_manager.load_provisions(@db_manager.read_attribute(:current_flow_id))
         old_provision = api_provisions.find { |provision| provision[:filename] == basename }
         unless old_provision.nil?
           if @prompt.yes? "found a same name file, override?"
-            @api_manager.delete_provision(old_provision[:id], @db_manager.read_attribute(:current_flow_id))
+            current_api_manager.delete_provision(old_provision[:id], @db_manager.read_attribute(:current_flow_id))
           else
             return puts "canceled.."
           end
         end
-        @api_manager.upload_provision(@db_manager.read_attribute(:current_flow_id), file_path)
+        current_api_manager.upload_provision(@db_manager.read_attribute(:current_flow_id), file_path)
         puts "uploaded."
       end
 
       desc "list_provisions", "list provisions"
       def list_provisions
-        puts @api_manager.load_provisions(@db_manager.read_attribute(:current_flow_id))
+        choosed_project_check
+        puts current_api_manager.load_provisions(@db_manager.read_attribute(:current_flow_id))
+      end
+
+      no_commands do
+        private
+
+        def current_api_manager
+          return @current_api_manager unless @current_api_manager.nil?
+          @api_manager.refresh_login  do
+            [@prompt.ask("email?"), @prompt.mask("password?")]
+          end
+          @current_api_manager = @api_manager
+          @current_api_manager
+        end
+
+        def choosed_project_check
+          project_init if @db_manager.read_attribute(:current_project_id).nil?
+        end
       end
     end
   end

data/lib/flow/cli/exception.rb

@@ -10,4 +10,7 @@ module Flow::Cli
 
   class ParamsError < BaseException
   end
+
+  class FlowApiError < BaseException
+  end
 end

data/lib/flow/cli/utils/api/flow_api_manager.rb

@@ -11,7 +11,10 @@ module Flow::Cli
           send "#{item}=", hash[item.to_s]
         end
         yield self if block_given?
-        init_access_token if user_access_token.nil?
+      end
+
+      def fetch_user
+        send_to_api("get", "/user")
       end
 
       def fetch_orgs
@@ -27,7 +30,7 @@ module Flow::Cli
       end
 
       def fetch_project(project_id)
-        send_to_api(:get, "/projects/#{project_id}")
+        send_to_apapi_manageri(:get, "/projects/#{project_id}")
       end
 
       def fetch_flows(project_id)
@@ -60,7 +63,7 @@ module Flow::Cli
         send_to_api(:get, "/flows/#{flow_id}/mobileprovisions")
       end
 
-      def delete_provision(mobileprovisions_id,flow_id)
+      def delete_provision(mobileprovisions_id, flow_id)
         send_to_api(:delete, "/mobileprovisions/#{mobileprovisions_id}", flow_id: flow_id)
       end
 
@@ -85,6 +88,26 @@ module Flow::Cli
         self.user_access_token = answer[:access_token]
       end
 
+      def refresh_login(&proc)
+        fetch_user
+      rescue FlowApiError
+        puts "login fail, relogin..."
+        tmp_email = nil
+        tmp_password = nil
+        tmp_email, tmp_password = yield unless proc.nil?
+        self.email = tmp_email || email
+        self.password = tmp_password || password
+        login(email, password)
+        self
+      end
+
+      def login(email, password)
+        hash = self.class.login(email, password)
+        %i[email password user_access_token].each do |item|
+          send "#{item}=", hash[item]
+        end
+      end
+
       def standard_file(file)
         return File.open(file) if file.is_a?(String)
         file
@@ -93,12 +116,13 @@ module Flow::Cli
       class << self
         def login(email, password)
           dict = FlowApiRest.post("/login", login: email, password: password)
-          DbManager.save(email: email, password: password)
-          dict
+          DbManager.save(email: email, password: password, user_access_token: dict[:access_token])
+          { email: email, password: password, user_access_token: dict[:access_token] }
         end
 
         def load_from_db
-          new(DbManager.read)
+          dict = DbManager.read
+          new(dict)
         end
       end
     end

data/lib/flow/cli/utils/flow_api_rest.rb

@@ -11,7 +11,7 @@ module Flow::Cli
           alias_method "#{method}_old", method
           define_method method do |*args, &blk|
             ret = __send__ "#{method}_old", *args, &blk
-            raise "response_body = #{ret[:response_body]}" if ret.is_a?(Hash) && ret[:status] == false
+            raise FlowApiError, "response_body = #{ret[:response_body]}" if ret.is_a?(Hash) && ret[:status] == false
             ret
           end
         end

data/lib/flow/cli/version.rb

@@ -1,5 +1,5 @@
 module Flow
   module Cli
-    VERSION = "0.0.3".freeze
+    VERSION = "0.0.4".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flow-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - atpking
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-13 00:00:00.000000000 Z
+date: 2017-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -210,7 +210,8 @@ post_install_message: "\n  _____ _     _____        ______ ___    ____ _     ___
   \\ /\\ / / |    | |  | |   | |    | |\n |  _| | |__| |_| |\\ V  V /| |___ | |  |
   |___| |___ | |\n |_|   |_____\\___/  \\_/\\_/(_)____|___|  \\____|_____|___|\n\n
   ****************************************************\n 这是 flow.ci CLI 的早期版本，暂时只支持
-  ios 项目\n\n0.0.3 版本新增 flow-cli remote 系列指令，支持传证书，传provisions 文件\n\n  "
+  ios 项目\n\n0.0.4 版本修正 在执行一些remote 指令，如果没登录，会报错的问题 另附增加 remote reset 指令\n0.0.3 版本新增
+  flow-cli remote 系列指令，支持传证书，传provisions 文件\n\n  "
 rdoc_options: []
 require_paths:
 - lib