docman 0.0.99 → 0.0.100

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c33f19d40ef65fbc0a67c8a5981cb6c1f5a2e755
-  data.tar.gz: fa2a0ab1aa3bc357222ee20befe1a5fd92d36e40
+  metadata.gz: e231868676b2f087fe12b8734ae861b205b95ad0
+  data.tar.gz: a87e681d52375023f07f9ef0019fcca151f16664
 SHA512:
-  metadata.gz: 85956602c75962475c80d14cd22dfb15c5d06e4fc5f8c4b9010188a430f5c2ac9435aeb0fa8d536ee59bbffa8a84542a937e179e0a04b988c09a90db34088943
-  data.tar.gz: 714f172b03ead9e1c62717a56a123579b4ed8bdeffed1a3f24c54d58bd01ff51f81b64123054388d5c600680d72ce638c321dcbb89fbec014727bd13f111c127
+  metadata.gz: b58e55802f3d67a3cd04283688770969c0e68c3af2cdea8fe73e31e5c8e2365f93eecfe1de41d7e06bd280642b5d2f0158e90692683556a1a80694021c2a6e04
+  data.tar.gz: 749fed753ef3466accdddbcbf0d46de7efc59e3462357f31b45855eb1ed9ad6de4442579ae2fed1a84e4f50389498e9b122d2bf5575bed1120d8eb7a7ef2d9f3

data/lib/application.rb

@@ -84,7 +84,7 @@ module Docman
     def build(deploy_target_name, state, options = false)
       with_rescue do
         @options = options
-        @docroot_config = DocrootConfig.new(@workspace_dir, deploy_target_name, options)
+        @docroot_config = DocrootConfig.new(@workspace_dir, deploy_target_name, options, state)
         @deploy_target = @docroot_config.deploy_target
         execute('build', state, nil, options['tag'])
       end
@@ -94,7 +94,7 @@ module Docman
       result = nil
       with_rescue do
         @options = options
-        @docroot_config = DocrootConfig.new(@workspace_dir, deploy_target_name, options)
+        @docroot_config = DocrootConfig.new(@workspace_dir, deploy_target_name, options, state)
         @deploy_target = @docroot_config.deploy_target
         @docroot_config.states_dependin_on(name, version).keys.each do |state|
           execute('deploy', state, name)

data/lib/docman/cli.rb

@@ -45,13 +45,21 @@ module Docman
     method_option :config, :desc => 'Configuration override JSON'
     method_option :config_dir, :desc => 'Config directories divided by coma where docman will search for config.yaml'
     option :tag
-    def build(deploy_target, state)
-      get_to_root_dir
-      if options[:force]
-        FileUtils.rm_rf('master') if File.directory? 'master'
+    def build(deploy_target="git_target", state="")
+      docman_state_var = "DOCMAN_STATE"
+      if ENV.has_key? docman_state_var and ENV[docman_state_var].length > 0
+        state = ENV[docman_state_var]
+      end
+      if state.length > 0
+        get_to_root_dir
+        if options[:force]
+          FileUtils.rm_rf('master') if File.directory? 'master'
+        end
+        Application.instance.build(deploy_target, state, options)
+        say('Complete!', :green)
+      else
+        say("Cant build without state parameter or #{docman_state_var} environment variable.")
       end
-      Application.instance.build(deploy_target, state, options)
-      say('Complete!', :green)
     end
 
     desc 'deploy', 'Deploy to target'

data/lib/docman/deployers/git_deployer.rb

@@ -14,7 +14,15 @@ module Docman
           prev_version = File.file?(filepath) ? File.open(filepath) : nil
           params = self['environment']['tagger']
           params['prev_version'] = prev_version
-          version = Docman::Taggers::Tagger.create(params, root, self).perform
+          version = ''
+          docman_tag_var = "DOCMAN_TAG"
+          if ENV.has_key? docman_tag_var and ENV[docman_tag_var].length > 0
+            puts "Variable #{docman_tag_var} => #{ENV[docman_tag_var]}"
+            version = ENV[docman_tag_var]
+          else
+            puts "Variable #{docman_tag_var} not found."
+            version = Docman::Taggers::Tagger.create(params, root, self).perform
+          end
           File.open(filepath, 'w') {|f| f.write(version) }
 
           filepath = File.join(root['full_build_path'], 'version.properties')

data/lib/docman/docroot_config.rb

@@ -8,7 +8,9 @@ module Docman
 
     attr_reader :structure, :deploy_target, :docroot_dir, :docroot_config_dir, :config_dir, :root, :raw_infos
 
-    def initialize(docroot_dir, deploy_target_name = nil, options = nil)
+    def initialize(docroot_dir, deploy_target_name = nil, options = nil, state = nil)
+      @state = state
+
       @override = {}
       if options && options['config']
         @override = JSON.parse(options['config'])
@@ -90,6 +92,8 @@ module Docman
         info.merge! @override['projects'][info['name']]
       end
 
+      info = override_from_environment(info)
+
       i = Docman::Info.new(info)
       @root = i if parent.nil?
       i['root'] = @root
@@ -130,6 +134,8 @@ module Docman
         info.merge! @override['projects'][info['name']]
       end
 
+      info = override_from_environment(info)
+
       i = Docman::Info.new(info)
       @root = i if parent.nil?
       i['root'] = @root
@@ -149,6 +155,54 @@ module Docman
       i
     end
 
+    def override_from_environment(info)
+
+      docman_config_var = "DOCMAN_CONFIG"
+      if ENV.has_key? docman_config_var and ENV[docman_config_var].length > 0
+        puts "Variable #{docman_config_var} => #{ENV[docman_config_var]}"
+        docman_config_overrides = JSON.parse(ENV[docman_config_var])
+        if docman_config_overrides['projects'] && docman_config_overrides['projects'].key?(info['name'])
+          info.merge! docman_config_overrides['projects'][info['name']]
+        end
+      else
+        puts "Variable #{docman_config_var} not found."
+      end
+
+      docman_repo_var = "DOCMAN_PROJECTS_#{info['name'].upcase}_REPO"
+      if ENV.has_key? docman_repo_var and ENV[docman_repo_var].length > 0
+        puts "Variable #{docman_repo_var} => #{ENV[docman_repo_var]}"
+        info['repo'] = ENV[docman_repo_var]
+      else
+        puts "Variable #{docman_repo_var} not found."
+      end
+
+      docman_order_var = "DOCMAN_PROJECTS_#{info['name'].upcase}_ORDER"
+      if ENV.has_key? docman_order_var and ENV[docman_tag_var].length > 0
+        puts "Variable #{docman_order_var} => #{ENV[docman_order_var]}"
+        info['order'] = ENV[docman_order_var]
+      else
+        puts "Variable #{docman_order_var} not found."
+      end
+
+      docman_version_var = "DOCMAN_PROJECTS_#{info['name'].upcase}_VERSION"
+      if ENV.has_key? docman_version_var and ENV[docman_version_var].length > 0
+        puts "Variable #{docman_version_var} => #{ENV[docman_version_var]}"
+        if @state.nil?
+          info['states'].each do |k,v|
+            info['states'][k]['type'] = "branch"
+            info['states'][k]['version'] = ENV[docman_version_var]
+          end
+        else
+          info['states'][@state]['type'] = "branch"
+          info['states'][@state]['version'] = ENV[docman_version_var]
+        end
+      else
+        puts "Variable #{docman_version_var} not found."
+      end
+
+      info
+    end
+
     def chain(info)
       chain = {}
       chain[info['name']] = info

data/lib/docman/version.rb

@@ -1,3 +1,3 @@
 module Docman
-  VERSION = "0.0.99"
+  VERSION = "0.0.100"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docman
 version: !ruby/object:Gem::Version
-  version: 0.0.99
+  version: 0.0.100
 platform: ruby
 authors:
 - Alexander Tolstikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-05 00:00:00.000000000 Z
+date: 2019-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler