config_kit 0.0.11 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d87686cf24927b1e2bfb70a50dfb58e2cde955e5
-  data.tar.gz: 1635b8f74554c97e702ec4261846cde10435a6c8
+SHA256:
+  metadata.gz: 323821610943389f9f2d36e3645a23f7b18d0dc7849f51b8f247b96c2a21c14e
+  data.tar.gz: 584a932bf10f6e30d8ae41426656e8e6bb50eb27b879a10d1f51ced10f53281c
 SHA512:
-  metadata.gz: f7965a88abcbbddaa6e0437f0fd7c61f371702c87b0beadf85074639548420d09132f1bff27a91a0a5be7570bd3a54b4169c4185d58ee7fb7bb8cccc0a39a55f
-  data.tar.gz: b51369d2c72f7c65c85b75eef778663a3c10794bcf1afb54ebc996e595f17403948f49563fcb392dfccbb2279b50324992527a732264e12babe14e0ce0aeda77
+  metadata.gz: 0210022a7402273430635769d4ea402cdd79e535f8277077daf135a7e6f182aced9fddeb6585a75a6024bac1c3d778ad6e9f2bd484410972cd9fdc0afa3ce94b
+  data.tar.gz: 94449467374b3ea571f410df0a0e007acd2afdb31ef047530b3ba09179423822253774c1af46078b556aaed04420507e5b1eb97550e7322c6acd85626144276b

data/.gitignore

@@ -1,35 +1,50 @@
-*.gem
-*.rbc
-.bundle
-.config
-coverage
-InstalledFiles
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
-
-# YARD artifacts
-.yardoc
-_yardoc
-doc/
-
-# Vim
-*.swp
-*.swo
-
-# ctags
-tags
-
-#Mac
-.DS_Store
-tmp/
+# These are some examples of commonly ignored file patterns.
+# You should customize this list as applicable to your project.
+# Learn more about .gitignore:
+#     https://www.atlassian.com/git/tutorials/saving-changes/gitignore
+
+# Node artifact files
+node_modules/
+dist/
+
+# Compiled Java class files
+*.class
+
+# Compiled Python bytecode
+*.py[cod]
 
-.idea
-reports/
+# Log files
+*.log
+
+# Package files
+*.jar
+
+# Maven
 target/
-log
-migrations/*.db
+dist/
+
+# JetBrains IDE
+.idea/
+
+# Unit test reports
+TEST*.xml
+
+# Generated by MacOS
+.DS_Store
+
+# Generated by Windows
+Thumbs.db
+
+# Applications
+*.app
+*.exe
+*.war
+
+# Large media files
+*.mp4
+*.tiff
+*.avi
+*.flv
+*.mov
+*.wmv
+

data/Gemfile

@@ -1,7 +1,6 @@
 source 'http://gems.sd.laxino.com'
 
-gem 'diplomat', '1.4.1'
-gem 'git', '1.3.0'
+gemspec
 group :test do
   gem 'simplecov', '0.12.0'
   gem 'rspec'

data/README.md

@@ -14,6 +14,10 @@ config_kit provides command line(ck) to init, bootstrap, deploy, rollout, rollba
 
 * init: init is to initialize metadata for specific data center, which will including the informaction of data center name and entitled environment for the data center
 
+```bash
+ck init -n 'moidc' -e 'Laxino.MO.Staging' -c 'stg0'
+```
+
 * describe: retrieve inforamation about all configuration or app configuration
 
 >describe all information of configuration

data/config_kit.gemspec

@@ -30,6 +30,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 3.0"
 
   spec.add_dependency "bundler", "~> 1.12"
-  spec.add_dependency "diplomat", "1.4.1"
+  spec.add_dependency "diplomat", "2.0.2"
   spec.add_dependency "git", "1.3.0"
-end
+end

data/docker/Dockerfile

@@ -0,0 +1,16 @@
+FROM cheokman/lax-base:latest
+
+ENV DEPLOY_PATH=/opt/deploy
+ENV APP_PATH=$DEPLOY_PATH/application
+ENV REL_PATH=$APP_PATH/release
+ENV SHARE_PATH=$APP_PATH/shared
+
+RUN mkdir -p $APP_PATH
+
+WORKDIR $REL_PATH
+COPY .ruby-version $REL_PATH/.ruby-version
+
+RUN /bin/bash -l -c "rvm install $(cat .ruby-version); gem install bundler; rvm cleanup all"
+
+RUN /bin/bash -l -c "gem install config_kit --version '>=0.0.15' --source http://gems.sd.laxino.com"
+ENV CK_URL='http://consul:8500'

data/lib/config_kit/cli/commands/init.rb

@@ -11,7 +11,7 @@ module ConfigKit::Cli
       begin
         raise ConfigKit::Cli::Command::CommandFailure.new 'Missing name options' if @name.nil?
         raise ConfigKit::Cli::Command::CommandFailure.new 'Missing environment options' if @env.nil?
-        @output = ConfigKit::Manager.init(@name, @env)
+        @output = ConfigKit::Manager.init(@name, @env, @codename)
         pp @output.to_h.to_json
       rescue ConfigKit::Cli::Command::CommandFailure
         raise
@@ -35,6 +35,11 @@ module ConfigKit::Cli
         opts.on('-e ENV', '--env', 'Specify a environment of IDC to config') do |env|
           @env = env
         end
+
+        opts.on('-c CODENAME', '--codename', 'Specify a codename of IDC to config') do |codename|
+          @codename = codename
+        end
+
       end
     end
   end

data/lib/config_kit/client.rb

@@ -13,8 +13,9 @@ module ConfigKit
 
       extend Forwardable
       def_delegators :@connection, :put, :get, :delete, :txn
-      def initialize(url, acl_token)
+      def initialize(url, acl_token, txn_limit=64)
         setup_consul(url, acl_token)
+        @txn_limit = txn_limit
       end
 
       def setup_consul(url, acl_token)
@@ -57,7 +58,19 @@ module ConfigKit
 
       def perform_txn
         begin
-          txn(@txn_data)
+          txn_length = @txn_data.length
+          current_index = 1
+          start_index = 0
+          end_index = 0
+          while @txn_limit * current_index < txn_length
+            start_index = @txn_limit * (current_index - 1)
+            end_index = @txn_limit * current_index - 1
+            txn(@txn_data[start_index..end_index])
+            current_index += 1
+          end
+          start_index = @txn_limit * (current_index - 1)
+          end_index = txn_length - 1
+          txn(@txn_data[start_index..end_index])
         rescue => e
           raise ConfigKitTxnError.new "perform txn error:#{e.message}"
         ensure

data/lib/config_kit/data/loader.rb

@@ -29,10 +29,10 @@ module ConfigKit
       ldrs = ldrs = File.expand_path(File.join(File.dirname(__FILE__), 'loaders', '*.rb'))
       Dir[ldrs].each {|loader| require loader}
 
-      def self.load(app, from, uri_kls, env, version, &block)
+      def self.load(app, from, uri_kls, env, codename, version, &block)
         @loader_names = @loaders.map{ |l| l.loader}
 
-        @uri_kls, @env, @app, @version = uri_kls, env, app, version
+        @uri_kls, @env, @app, @version, @codename = uri_kls, env, app, version, codename
 
         loader = from
 
@@ -40,12 +40,12 @@ module ConfigKit
         if loader.nil?
           ConfigKit.logger.error "from empty source with #{@uri_kls.to_s}"
         elsif !@loader_names.include?(loader)
-          ConfigKit.logger.error "Unrecognize loader: #{loader} for #{@uri}"
+          ConfigKit.logger.error "Unrecognize loader: #{loader} for #{@uri}(#{@codename})"
         else
           loader_class = @loaders.find{ |c| c.loader == loader}
-          ConfigKit.logger.debug "#{loader_class.loader} is loading env(#{@env}) app(#{app}) data(#{@version}) from #{uri_kls.to_s}"
-          loader_class.new(@uri_kls, @env, @app, @version).run(&block)
-          ConfigKit.logger.debug "#{loader_class.loader} is loaded env(#{@env}) app(#{app}) data(#{@version}) from #{uri_kls.to_s}"
+          ConfigKit.logger.debug "#{loader_class.loader} is loading env(#{@env}) app(#{app}) data(#{@version}) codename(#{codename}) from #{uri_kls.to_s}"
+          loader_class.new(@uri_kls, @env, @codename, @app, @version).run(&block)
+          ConfigKit.logger.debug "#{loader_class.loader} is loaded env(#{@env}) app(#{app}) data(#{@version}) codename(#{codename}) from #{uri_kls.to_s}"
         end
       rescue => e
         raise ConfigKit::Data::Loader::LoaderFailure.new e.message

data/lib/config_kit/data/loaders/file_loader.rb

@@ -4,9 +4,9 @@ module ConfigKit::Data
     def self.loader; "file"; end
 
     attr_reader :files
-    def initialize(uri_kls, env, app, branch)
-      @uri_kls, @env, @app, @branch = uri_kls, env, app, branch
-      @path = File.expand_path('.',File.join(retrieve_path(@uri_kls.path),env))
+    def initialize(uri_kls, env, codename, app, branch)
+      @uri_kls, @env, @codename, @app, @branch = uri_kls, env, codename, app, branch
+      @path = File.expand_path('.',File.join(retrieve_path(@uri_kls.path),@codename))
       super()
     end
 
@@ -36,9 +36,9 @@ module ConfigKit::Data
 
     def retrieve_files
       files = if @app == 'all' 
-        Dir["#{@path}/**/*.yml"].select { |f| match_for?(f, @env) }
+        Dir["#{@path}/**/*.yml"].select { |f| match_for?(f, @codename) }
       else
-        Dir["#{@path}/**/*.yml"].select {|f| match_for?(f, @app) && match_for?(f, @env)}
+        Dir["#{@path}/**/*.yml"].select {|f| match_for?(f, @app) && match_for?(f, @codename)}
       end
       raise ConfigKit::Data::Loader::LoaderFailure.new('No data file found.') if files.empty?
       files
@@ -51,13 +51,13 @@ private
       path
     end
 
-    def env_app_for(f)
+    def codename_app_for(f)
       File.basename(f).split('.')[0..1]
     end
 
     def load_one(f)
-      env, app = env_app_for(f)
-      raise ConfigKit::Data::Loader::LoaderFailure.new("Wrong data file env(#{env}) for loaded #{@env}") unless env == @env
+      codename, app = codename_app_for(f)
+      raise ConfigKit::Data::Loader::LoaderFailure.new("Wrong data file codename(#{codename}) for loaded #{@codename}") unless codename == @codename
       {app => YAML.load_file(f)}
     end
 

data/lib/config_kit/data/loaders/git_loader.rb

@@ -4,8 +4,8 @@ module ConfigKit::Data
     class GitLoaderError < ConfigKit::Error; end
     def self.loader; "git"; end
     attr_reader :clone_path
-    def initialize(uri_kls, env, app, version)
-      @uri_kls, @env, @app, @version = uri_kls, env, app, version
+    def initialize(uri_kls, env, codename, app, version)
+      @uri_kls, @env, @codename, @app, @version = uri_kls, env, codename, app, version
       @clone_path = Dir.mktmpdir
       @file_path = "file://#{@clone_path}"
       @file_kls = URI.parse(@file_path)
@@ -15,7 +15,7 @@ module ConfigKit::Data
     def run(&block)
       ConfigKit.logger.debug "Git is loading env(#{@env}) #{@app} from #{@uri_kls.to_s}"
       begin
-        FileLoader.new(@file_kls, @env, @app, @version).run(&block)
+        FileLoader.new(@file_kls, @env, @codename, @app, @version).run(&block)
       ensure
         FileUtils.rm_rf @clone_path
       end
@@ -23,7 +23,7 @@ module ConfigKit::Data
 
 private
     def clone
-      ConfigKit.logger.debug "Git is cloning env(#{@env}) #{@app} from #{@uri_kls.to_s}"
+      ConfigKit.logger.debug "Git is cloning env(#{@env}) #{@app} codename(#{@codename}) from #{@uri_kls.to_s}"
       begin
         g = Git.clone(@uri_kls.to_s, @clone_path)
         tags =  g.tags.map { |t| t.name }

data/lib/config_kit/idc_data.rb

@@ -2,8 +2,8 @@ require 'config_kit/ext/slashed_hash'
 
 module ConfigKit
   class IDCData < SlashedHash
-    def initialize(name, env, opts)
-      @name, @env = name, env
+    def initialize(name, env, codename, opts)
+      @name, @env, @codename = name, env, codename
       @api_version = opts.fetch(:api_version, '1.0')
       @kind = opts.fetch(:kind, 'config_kit')
       @bind_data = binding_data
@@ -13,7 +13,8 @@ module ConfigKit
     def data
       { 
         'name' => @name,
-        'env' => @env
+        'env' => @env,
+        'codename' => @codename
       }
     end
 

data/lib/config_kit/manager.rb

@@ -25,11 +25,12 @@ module ConfigKit
       new(app, opts).deploy
     end
 
-    def self.init(name, env='int0', opts={})
+    def self.init(name, env='int0', codename='int0', opts={})
       app = 'idc'
       opts['name'] = name
       opts['env'] = env
-      opts['skip_env_check'] = true
+      opts['codename'] = codename
+      opts['skip_codename_check'] = true
       new(app,opts).init
     end
 
@@ -41,19 +42,21 @@ module ConfigKit
       @app = app
       @opts = opts
       @tool = ConfigKit::Tool.new
-      unless opts['skip_env_check'] == true
-        env = @tool.get_idc_env 
-        raise ConfigKit::Manager::IDCEnvMissing.new 'IDC environment missing, pls init it first!' if env.nil?
+      unless opts['skip_codename_check'] == true
+        codename = @tool.get_idc_codename
+        env = @tool.get_idc_env
+        raise ConfigKit::Manager::IDCEnvMissing.new 'IDC environment/codename missing, pls init it first!' if codename.nil? && env.nil?
+        @opts['codename'] = codename
         @opts['env'] = env
       end
-      
     end
 
     def init
       name = @opts.delete('name')
       env = @opts.delete('env')
+      codename = @opts.delete('codename')
       @tool.init_txn
-      @tool.idc_init_txn(name, env, @opts)
+      @tool.idc_init_txn(name, env, codename, @opts)
       @tool.perform_txn
     end
 
@@ -68,7 +71,7 @@ module ConfigKit
     end
 
     def create(extra=:no_default)
-      ConfigKit::Data::Loader.load(@app, @opts['from'], @opts['uri_kls'], @opts['env'], @opts['version']) do |data|
+      ConfigKit::Data::Loader.load(@app, @opts['from'], @opts['uri_kls'], @opts['env'], @opts['codename'], @opts['version']) do |data|
         @tool.init_txn
         data.each_pair do |k,v|
           @tool.bootstrap_txn(v, k)

data/lib/config_kit/tool.rb

@@ -45,12 +45,12 @@ module ConfigKit
       @client.read(path).nil?
     end
 
-    def idc_config(name, env, opts)
-      ConfigKit::IDCData.new(name, env, opts)
+    def idc_config(name, env, codename, opts)
+      ConfigKit::IDCData.new(name, env, codename, opts)
     end
 
-    def idc_init_txn(name, env, opts={})
-      @idc_data = idc_config(name, env, opts)
+    def idc_init_txn(name, env, codename, opts={})
+      @idc_data = idc_config(name, env, codename, opts)
       @client.create_txn(@idc_data)
     end
 
@@ -66,6 +66,12 @@ module ConfigKit
       data['config_kit']['idc']['env'] 
     end
 
+    def get_idc_codename
+      data =  @client.read(idc_path)
+      return nil if data.nil?
+      data['config_kit']['idc']['codename'] 
+    end
+
     def describe(app, version)
       @content = {}
       data = @client.read(idc_path)
@@ -124,8 +130,6 @@ module ConfigKit
         raise MissingDefaultVersionError.new "Missing default version for app(#{app}), pls set default version first.\n"
       end
       app_path = path_for(app, version)
-      pp app_path
-      pp @client.read(app_path)
       app_version = @client.read(app_path)[kind]
       app_data = {}
       app_data[app] = app_version[app][version]
@@ -153,16 +157,16 @@ module ConfigKit
     end
 
     def deploy_path
-      "/#{kind}/deploy"
+      "#{kind}/deploy"
     end
 
     def path_for(app, version=nil)
-      return "/#{kind}/#{app}" if version.nil?
-      "/#{kind}/#{app}/#{version}" 
+      return "#{kind}/#{app}" if version.nil?
+      "#{kind}/#{app}/#{version}" 
     end
 
     def idc_path
-      "/#{kind}/idc"
+      "#{kind}/idc"
     end
   end
 end

data/lib/config_kit/version.rb

@@ -1,3 +1,3 @@
 module ConfigKit
-  VERSION = '0.0.11'
-end
+  VERSION = '0.0.16'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: config_kit
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.16
 platform: ruby
 authors:
 - Ben Wu
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-07-19 00:00:00.000000000 Z
+date: 2024-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 2.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
@@ -86,6 +86,7 @@ files:
 - config/stg0/stg0.axle.yml
 - config/stg0/stg0.infra.yml
 - config_kit.gemspec
+- docker/Dockerfile
 - lib/config_kit.rb
 - lib/config_kit/cli/command.rb
 - lib/config_kit/cli/commands/bootstrap.rb
@@ -116,7 +117,7 @@ licenses:
 - Ruby
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -131,9 +132,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Write a short summary, because Rubygems requires one.
 test_files: []