gct 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2208b729536833b256e4a434a5c381771f3cc240126f099e48d52fd8ca53028
-  data.tar.gz: 3d0b9850f3612accee8d2d82b4fa27de812df4f57a285d9628109ca79cd27267
+  metadata.gz: c4c7ac5d299bdcd12bcf268d4f7d703d3cc928ec1bdf68a6a7607eb88776bfa1
+  data.tar.gz: ec3a3e19a4934758f25b7782b18033a6b5ae7b4011fe7f72a9a0600c6e31ca52
 SHA512:
-  metadata.gz: e72dadc08c468c15410133874ab90cdf2728f519b423204ccd8550f7a046e7caa9831d97fcc6e2aa2db2cc3b1430936bc435edccc5afbf6f4993af261749321e
-  data.tar.gz: ec2ddf310939d2a1b3cac6915243355933a84a0be21fb871005f18757111353fc5bb6c974aecd22ff879e83b101c663467e6c60df60ea154e0fe7a21f0d0139c
+  metadata.gz: 8ee1ec1276911016661047a4e3b85a78e51fbc8fee6d08531075bd26c43d598e4cf066a33712e9af51e9c6a317b5621e76d964a4c931a131f4952295696b4a2d
+  data.tar.gz: 3a10b473568f55e49de457f50f367010db7742eaf2ecde4684703a66835cbc7a7d10b1dcf8f33c41721a286c660b0aa9c682018e8db0585d4043f5b43f57ff3e

data/lib/gct/command.rb

@@ -50,8 +50,6 @@ module Gct
         Colored2.disable!
         String.send(:define_method, :colorize) { |string, _| string }
       end
-
-      config_gitlab
     end
 
     def file_contents(project_id, file, branch)
@@ -61,11 +59,17 @@ module Gct
     end
 
     def config_gitlab
-      token = Config.get_config("token")
-      raise "请先配置token！gct config set token GITLAB_PERSON_TOKEN".red if token.nil?
-      Gitlab.configure do |config|
-        config.endpoint = 'https://gi-dev.ccrgt.com/api/v4' 
-        config.private_token = token       
+      if FileBase.exist_root
+        token = FileBase.get_config("token")
+        if token
+          raise "请先配置token！gct config set token GITLAB_PERSON_TOKEN".red if token.nil?
+          Gitlab.configure do |config|
+            config.endpoint = 'https://gi-dev.ccrgt.com/api/v4' 
+            config.private_token = token       
+          end
+        else
+          raise "请先运行命令：gct set token xxx，参考文档:http://febase.crgt.xyz/docs/app_ios/base".red
+        end
       end
     end
 

data/lib/gct/command/analyze.rb

@@ -20,6 +20,7 @@ module Gct
         @project_id = argv.shift_argument
         @file = argv.shift_argument
         @branch = argv.shift_argument
+        config_gitlab
         super
       end
 

data/lib/gct/command/config.rb

@@ -4,39 +4,12 @@ require 'gct/command/config/get'
 module Gct
   class Command
     class Config < Command
+      self.abstract_command = true
       self.summary = 'gct 配置'
       self.description =  <<-DESC
         配置全局链接等
       DESC
-
-      def initialize(argv)
-        @list = argv.flag?('list', false)
-        super
-      end
-
-      def run
-        # get_all_config if @list
-      end
-
-      def self.options 
-        [
-          ['--list', '打印config所有信息'],
-        ].concat(super)
-      end
-
-      def self.get_config(key)
-        file_base = FileBase.new(config_path)
-        file_base.yaml_read(key)
-      end
-
-      def self.set_config(key, value)
-        file_base = FileBase.new(config_path)
-        file_base.yaml_write(key, value)
-      end
-
-      def self.config_path
-        "#{Generator::GctFile.config_file_path}"
-      end
+      
     end
   end
 end

data/lib/gct/command/config/get.rb

@@ -23,7 +23,7 @@ module Gct
         end
 
         def run
-          puts "#{@key}: #{get_config(@key)}"
+          puts "#{FileBase.get_config(@key)}"
         end
       end
     end

data/lib/gct/command/config/set.rb

@@ -26,7 +26,7 @@ module Gct
         end
 
         def run
-          set_config(@key, @value)
+          FileBase.set_config(@key, @value)
         end
       end
     end

data/lib/gct/command/update.rb

@@ -9,6 +9,11 @@ module Gct
       self.description =  <<-DESC
         更新组件tag、主工程版本号等
       DESC
+
+      def initialize(argv)
+        super
+        config_gitlab
+      end
     end
   end
 end

data/lib/gct/command/update/version.rb

@@ -19,7 +19,6 @@ module Gct
           name = @name ||= "iLife"
           @project_id = "#{Constant.NameSpace}#{name}"
           @file = "#{name}.xcodeproj/project.pbxproj"
-          @branch = current_branch.rstrip
           super
         end
 
@@ -28,6 +27,7 @@ module Gct
         end
 
         def run
+          @branch = current_branch
           update_version
         end
 
@@ -54,7 +54,9 @@ module Gct
         end
 
         def current_branch
-          "#{`git branch | awk  '$1 == "*" {print $2}'`}"
+          branch = "#{`git branch | awk  '$1 == "*" {print $2}'`}".rstrip
+          raise "该文件夹不是一个git仓库".red if branch.empty?
+          branch
         end
       end
     end

data/lib/gct/file_base.rb

@@ -1,29 +1,56 @@
 module Gct
-  class FileBase
-    
-    attr_reader :path
+  module FileBase
+    class << self
+      attr_reader :path
 
-    def initialize(path)
-      @path = path
-    end
+      def initialize(path)
+        @path = path
+      end
 
-    def yaml_write(key, value)
-      begin
-        yaml_file = File.open(@path, "w")
-        YAML::dump({key => value}, yaml_file)
-      rescue IOError => e
-        raise e.message
-      ensure
-        yaml_file.close unless yaml_file.nil?
+      def yaml_write(key, value)
+        begin
+          yaml_file = File.open(@path, "w")
+          YAML::dump({key => value}, yaml_file)
+        rescue IOError => e
+          raise e.message
+        ensure
+          yaml_file.close unless yaml_file.nil?
+        end
+      end
+
+      def yaml_read(key)
+        begin
+          yaml_file = YAML.load(File.open(@path, "r"))
+          if yaml_file
+            yaml_file[key]
+          end
+        rescue IOError => e
+          raise e.message
+        end
+      end
+
+      def get_config(key)
+        if exist_root
+          @path = config_path
+          yaml_read(key)
+        end
+      end
+
+      def set_config(key, value)
+        if exist_root
+          @path = config_path
+          yaml_write(key, value)
+        end
+      end
+
+      def config_path
+        "#{Generator::GctFile.config_file_path}"
       end
-    end
 
-    def yaml_read(key)
-      begin
-        yaml_file = YAML.load(File.open(@path, "r"))
-        yaml_file[key]
-      rescue IOError => e
-        raise e.message
+      def exist_root
+        root_exist = File.exist?(Generator::GctFile.root_folder_path)
+        raise "请先运行命令：gct setup".red if !root_exist
+        root_exist
       end
     end
   end

data/lib/gct/gct_version.rb

@@ -2,5 +2,5 @@ module Gct
   # freeze 冻结对象，将对象变成一个常量
   # unless 右边的代码块成立，才会运行左边的代码块
   # defined? 是用来判断本地变量是否存在，也可用来判断是否存在方法
-  VERSION = "0.3.4".freeze unless defined? Gct::VERSION
+  VERSION = "0.3.5".freeze unless defined? Gct::VERSION
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gct
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - jieming