docman 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03c6d600c4554cc1eb0570c4c1248f6662db3af0
-  data.tar.gz: 8511855ac1a09d583c0ce3cef70c7d4a5c96a228
+  metadata.gz: 05cf8e4e48f3caf7169aa6a3d492bc6bcd2d57ff
+  data.tar.gz: 9d41372a3eaf9c7983919c98d505ebdb26e7339b
 SHA512:
-  metadata.gz: 4fec63186230d02c13e1df24e52c812a175fb63b590319bafa6d2c9175e088ea543cd4976f823e90ed9c4ea15c8137b4b013000bb663a353712ac11493194b19
-  data.tar.gz: 485796775944d65fa287c66e76140f42c3fb500dc3de54d445a54bc122b19701f73cb0a01ea11a1e8663ee1e0dcde511b4fc0073af1b0c391b9935fee15b6867
+  metadata.gz: 9f282d5d035f25df19ea05bed2fbe2929cf98ccd124b9ad098ae8a557fb06cccf5f0673709640e4c434f1c312893a23633757a6a47c8021151f64666496b2e77
+  data.tar.gz: 46574cf8a6815bdbe9c93177a0123c8bbd4e0d3b992a02774de5644f428246d27fad0b3f2c572877595ba1fd1fab1e330481441b5334743bd51e48eeafd0a19b

data/lib/docman/builders/builder.rb

@@ -5,10 +5,10 @@ module Docman
     class Builder
       @@subclasses = {}
 
-      def self.create(type, root, build_type, state, info)
+      def self.create(type, root, build_type, info)
         c = @@subclasses[type]
         if c
-          c.new(root, build_type, state, info)
+          c.new(root, build_type, info)
         else
           raise "Bad builder type: #{type}"
         end
@@ -18,10 +18,9 @@ module Docman
         @@subclasses[name] = self
       end
 
-      def initialize(root, build_type, state, info)
+      def initialize(root, build_type, info)
         @root = root
         @build_type = build_type
-        @state = state
         @info = info
         @before_build_actions = @build_type['before_build_actions'].nil? ? [] : @build_type['before_build_actions']
         @after_build_actions = @build_type['after_build_actions'].nil? ? [] : @build_type['after_build_actions']
@@ -37,26 +36,10 @@ module Docman
       def do
         perform(@before_build_actions, 'before_build_action')
         # Dispatch to corresponding method.
-        write_info self.send("#{@build_type['type']}")
+        @info.write_info(self.send("#{@build_type['type']}"))
         perform(@after_build_actions, 'after_build_action')
       end
 
-      def write_info(result)
-        to_save = {}
-        # to_save = @info.clone
-        to_save['state'] = @state
-        to_save['version_type'] = @info.version_type(@state) unless @info.version_type(@state).nil?
-        to_save['version'] = @info.version(@state) unless @info.version(@state).nil?
-        to_save['ref'] = result
-        to_save['build_type'] = @build_type['type']
-        # to_save.delete('full_build_path')
-        # to_save.delete('full_path')
-        # to_save.delete('temp_path')
-        # to_save.delete('repo')
-        # to_save.delete('states')
-        File.open("#{@info['full_build_path']}/info.yaml", 'w') {|f| f.write to_save.to_yaml}
-      end
-
       def perform(actions, method_prefix)
         unless actions.nil?
           actions.each do |action|
@@ -71,7 +54,7 @@ module Docman
       end
 
       def after_build_action_git_commit
-        message = "name: #{@info['name']} updated, state: #{@state}"
+        message = "name: #{@info['name']} updated, state: #{@info['state']}"
         GitUtil.commit(@root['full_build_path'], @info['full_build_path'], message)
       end
     end

data/lib/docman/builders/git_builder.rb

@@ -8,27 +8,19 @@ module Docman
 
       def direct
         puts 'Do direct'
-        GitUtil.get(@info['repo'], @info['full_build_path'], version_type, version)
+        GitUtil.get(@info['repo'], @info['full_build_path'], @info.version_type, @info.version)
       end
 
       def strip
         puts 'Do strip'
         FileUtils.rm_r(@info['full_build_path']) if File.directory? @info['full_build_path']
-        result = GitUtil.get(@info['repo'], @info['temp_path'], version_type, version)
+        result = GitUtil.get(@info['repo'], @info['temp_path'], @info.version_type, @info.version)
         FileUtils.mkdir_p(@info['full_build_path'])
         FileUtils.cp_r(Dir["#{@info['temp_path']}/."], @info['full_build_path'])
         FileUtils.rm_r(File.join(@info['full_build_path'], '.git'))
         result
       end
 
-      # TODO: need to refactor into into @info class.
-      def version
-        @info['states'][@state]['version']
-      end
-
-      def version_type
-        @info['states'][@state]['type']
-      end
     end
   end
 end

data/lib/docman/deployers/deployer.rb

@@ -4,10 +4,10 @@ module Docman
 
       attr_reader :deploy_target
 
-      def build(root, state, info)
+      def build(root, info)
         return if @deployed.include? info['name']
         build_type = build_type(info['type'])
-        Docman::Builders::Builder.create(build_type['handler'], root, build_type, state, info).do()
+        Docman::Builders::Builder.create(build_type['handler'], root, build_type, info).do()
         @deployed << info['name']
       end
 

data/lib/docman/deployers/local_deployer.rb

@@ -1,7 +1,7 @@
 module Docman
   module Deployers
     class LocalDeployer < Deployer
-      def push(info)
+      def push(info, state_name)
       end
     end
   end

data/lib/docman/docroot_config.rb

@@ -5,7 +5,7 @@ module Docman
 
   class DocrootConfig
 
-    attr_reader :structure
+    attr_reader :structure, :deploy_target
 
     def initialize(docroot_dir, deploy_target)
       @docroot_dir = docroot_dir
@@ -27,6 +27,7 @@ module Docman
       name = File.basename path
       prefix = prefix.size > 0 ? File.join(prefix, name) : name
       info['full_path'] = path
+      info['docroot_config'] = self
       info['build_path'] = prefix
       info['full_build_path'] = File.join(@docroot_dir, prefix)
       info['temp_path'] = File.join(@docroot_dir, 'tmp', info['build_path'])

data/lib/docman/docroot_controller.rb

@@ -57,7 +57,8 @@ module Docman
     end
 
     def build_dir(state, info)
-      @deployer.build(@docroot_config.root(info), state, info)
+      info.state = state
+      @deployer.build(@docroot_config.root(info), info)
     end
 
   end

data/lib/docman/info.rb

@@ -1,20 +1,32 @@
 module Docman
   class Info < Hash
+
     def initialize(hash = {})
       super
       hash.each_pair do |k, v|
         self[k] = v
       end
-      set_build_type
-      # self['rebuild'] = need_rebuild?
+      self['build_type'] = self['docroot_config'].deploy_target['builders'][self['type']]['type']
     end
 
-    def version(state)
-      self['states'][state].nil? ? nil : self['states'][state]['version']
+    def version
+      self['states'][self['state']].nil? ? nil : self['states'][self['state']]['version']
     end
 
-    def version_type(state)
-      self['states'][state].nil? ? nil : self['states'][state]['type']
+    def version_type
+      self['states'][self['state']].nil? ? nil : self['states'][self['state']]['type']
+    end
+
+    def write_info(result)
+      to_save = {}
+      to_save['state'] = self['state']
+      to_save['version_type'] = self.version_type unless self.version_type.nil?
+      to_save['version'] = self.version unless self.version.nil?
+      # to_save['ref'] = result
+      to_save['type'] = self['type']
+      to_save['build_type'] = self['build_type']
+
+      File.open("#{self['full_build_path']}/info.yaml", 'w') {|f| f.write to_save.to_yaml}
     end
 
     def need_rebuild?
@@ -28,8 +40,9 @@ module Docman
       false
     end
 
-    def set_build_type
-      Docman::Application.instance.deploy_target['builders'][self['type']]['type']
+    def state=(state)
+      self['state'] = state
     end
+
   end
 end

data/lib/docman/version.rb

@@ -1,3 +1,3 @@
 module Docman
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docman
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Alexander Tolstikov