docman 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05cf8e4e48f3caf7169aa6a3d492bc6bcd2d57ff
-  data.tar.gz: 9d41372a3eaf9c7983919c98d505ebdb26e7339b
+  metadata.gz: 0f0ba6187a0fad64e125554d5d75a17c3e6fda06
+  data.tar.gz: 56c484c7c676ccbb7d7ba394f59e1a32e4d48c2f
 SHA512:
-  metadata.gz: 9f282d5d035f25df19ea05bed2fbe2929cf98ccd124b9ad098ae8a557fb06cccf5f0673709640e4c434f1c312893a23633757a6a47c8021151f64666496b2e77
-  data.tar.gz: 46574cf8a6815bdbe9c93177a0123c8bbd4e0d3b992a02774de5644f428246d27fad0b3f2c572877595ba1fd1fab1e330481441b5334743bd51e48eeafd0a19b
+  metadata.gz: 771396971be50da7bf5df9063620b69a40e2728c4de3ff80f6f323f36318108f687b688c466ced4197a615f8341919a90f8e4736d404b6dcb2a340aa5090e4d6
+  data.tar.gz: 3179ec03c8f81b8aa86cc4ddea9a2bbee82baa09a5b4b99103fb1fbd84b27b56f9a7170d70c61a927ecb482712f07b012d6c4bef83111cb5b8f8b5711a6c4454

data/config/config.yaml

@@ -1,7 +1,7 @@
 ---
 deploy_targets:
   local:
-    handler: LocalDeployer
+    handler: :common_deployer
     builders:
       root:
         handler: :common
@@ -16,7 +16,7 @@ deploy_targets:
         handler: :common
         type: dir
   acquia:
-    handler: GitDeployer
+    handler: :git_deployer
     deploy_action: git_push
     builders:
       root:

data/features/local.feature

@@ -6,8 +6,18 @@ Feature: Docroot management
 
   @announce
   @no-clobber
-  Scenario: Local init
-    Given I run `docman init sample-docroot https://github.com/aroq/dm-test-docroot-config.git`
+  Scenario: Local force init
+    Given I run `docman init sample-docroot https://github.com/aroq/dm-test-docroot-config.git -f`
+    Then the exit status should be 0
+    Then the following directories should exist:
+      | sample-docroot |
+      | sample-docroot/config |
+
+  @announce
+  @no-clobber
+  Scenario: Local interactive init
+    Given I run `docman init sample-docroot https://github.com/aroq/dm-test-docroot-config.git` interactively
+    And I type "yes"
     Then the exit status should be 0
     Then the following directories should exist:
       | sample-docroot |
@@ -36,6 +46,9 @@ Feature: Docroot management
     And I run `git checkout develop`
     And I run `git pull origin develop`
     Then the exit status should be 0
+    And I store in "name" value "test"
+    And I check stored value of "name" should contain "test"
+    And I create file with random name in "filename" content in "random_name"
     Given a file named "develop.txt" with:
       """
       test content

data/features/support/step_definitions/dm_steps.rb

@@ -5,17 +5,33 @@
 #   end
 # end
 #
+
+Then(/^I store in "(.*?)" value "(.*?)"$/) do |name, value|
+  @name = value
+end
+
+Then(/^I check stored value of "(.*?)" should contain "(.*?)"$/) do |name, value|
+  expect(@name).to eq(value)
+end
+
+Then(/^I create file with random name and content and store its name in "(.*?)"$/) do |name|
+# random_file_name = ('a'..'z').to_a.shuffle[0,8].join
+#   self.instance_variable_set(:@name, random_file_name)
+#   self.instance_variable_set(:@name, random_file_name)
+#   @random_file_content = ('a'..'z').to_a.shuffle[0,8].join
+end
+
 When(/^I store bump version from file "(.*?)"$/) do |file|
   ENV['DM_BUMPED_VERSION'] = IO.read(file)
 end
 
 When(/^I change repo state to last bumped tag for "(.*?)" version$/) do |state|
-  version = ENV["DM_BUMPED_VERSION"]
+  version = ENV['DM_BUMPED_VERSION']
   run "state.sh tag #{version} #{state}"
 end
 
 Then(/^the file "(.*?)" should contain last bumped tag$/) do |file|
-  version = ENV["DM_BUMPED_VERSION"]
+  version = ENV['DM_BUMPED_VERSION']
   puts "Last bumped tag: #{version}"
   prep_for_fs_check { expect(IO.read(file)).to eq version }
 end

data/lib/application.rb

@@ -28,10 +28,11 @@ module Docman
 
     def build(deploy_target, state, options = false)
       @options = options
-      DocrootController.new(@workspace_dir, deploy_target, options).build(state)
+      DocrootController.new(@workspace_dir, deploy_target).build(state)
     end
 
-    def deploy(deploy_target, name, type, version)
+    def deploy(deploy_target, name, type, version, options = false)
+      @options = options
       DocrootController.new(@workspace_dir, deploy_target).deploy(name, type, version)
     end
 

data/lib/docman/cli.rb

@@ -7,36 +7,48 @@ module Docman
     # TODO: add proper descriptions.
 
     desc 'init NAME', 'init to NAME'
+    method_option :force, :aliases => '-f', :desc => 'Force init'
     def init(name, repo)
       if File.directory? "#{name}"
-        say("Complete!", :green)
-        $stderr.puts "Directory #{name} already exists"
-        choice = ask('Are you sure you want do delete existing docroot?')
-        FileUtils.rm_r(name) if choice == 'yes'
+        say("Directory #{name} already exists")
+        if options[:force]
+          FileUtils.rm_r(name)
+        elsif
+        choice = ask('Are you sure you want do delete existing docroot? Type "yes" if you agree.')
+          if choice == 'yes'
+            FileUtils.rm_r(name)
+          elsif
+          Kernel::abort 'Exit'
+          end
+        end
       end
 
       puts "Init docroot directory #{name} and retrieve config from provided repo."
       Application.instance.init(name, repo)
+      say('Complete!', :green)
     end
 
     desc 'build NAME', 'init to NAME'
     method_option :force, :aliases => '-f', :desc => 'Force full rebuild'
     def build(deploy_target, state)
       config_dir?
-
       Application.instance.build(deploy_target, state, options)
+      say('Complete!', :green)
     end
 
     desc 'deploy NAME', 'init to NAME'
+    method_option :force, :aliases => '-f', :desc => 'Force full deploy'
     def deploy(deploy_target, name, type, version)
       config_dir?
-      Application.instance.deploy(deploy_target, name, type, version)
+      Application.instance.deploy(deploy_target, name, type, version, options)
+      say('Complete!', :green)
     end
 
     desc 'state NAME', 'init to NAME'
     def state(name, type, version)
       config_dir?
       Application.instance.state(name, type, version)
+      say('Complete!', :green)
     end
 
     no_commands {

data/lib/docman/deployers/{local_deployer.rb → common_deployer.rb}

@@ -1,6 +1,9 @@
 module Docman
   module Deployers
-    class LocalDeployer < Deployer
+    class CommonDeployer < Deployer
+
+      register_deployer :common_deployer
+
       def push(info, state_name)
       end
     end

data/lib/docman/deployers/deployer.rb

@@ -4,11 +4,19 @@ module Docman
 
       attr_reader :deploy_target
 
-      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, info).do()
-        @deployed << info['name']
+      @@subclasses = {}
+
+      def self.create(type, deploy_target)
+        c = @@subclasses[type]
+        if c
+          c.new(deploy_target)
+        else
+          raise "Bad deployer type: #{type}"
+        end
+      end
+
+      def self.register_deployer(name)
+        @@subclasses[name] = self
       end
 
       def initialize(deploy_target)
@@ -16,6 +24,13 @@ module Docman
         @deploy_target = deploy_target
       end
 
+      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, info).do()
+        @deployed << info['name']
+      end
+
       def build_type(type)
         @deploy_target['builders'][type]
       end

data/lib/docman/deployers/git_deployer.rb

@@ -1,6 +1,9 @@
 module Docman
   module Deployers
     class GitDeployer < Deployer
+
+      register_deployer :git_deployer
+
       def push(info, state_name)
         version = info['states'][state_name]['version']
         GitUtil.push(info['full_build_path'], version)

data/lib/docman/docroot_config.rb

@@ -23,6 +23,7 @@ module Docman
     def structure_build(path, prefix = '', parent = nil)
       return unless File.file? File.join(path, 'info.yaml')
 
+      children = []
       info = YAML::load_file(File.join(path, 'info.yaml'))
       name = File.basename path
       prefix = prefix.size > 0 ? File.join(prefix, name) : name
@@ -33,13 +34,14 @@ module Docman
       info['temp_path'] = File.join(@docroot_dir, 'tmp', info['build_path'])
       info['name'] = name
       info['parent'] = parent
+      info['children'] = children
 
       i = Docman::Info.new(info)
 
       @names[name.to_s] = i
 
-      data = {:data => info, :info => i}
-      data[:children] = children = []
+      data = [i]
+      # data[:children] = children
       Dir.foreach(path) do |entry|
         next if (entry == '..' || entry == '.')
         full_path = File.join(path, entry)
@@ -50,7 +52,7 @@ module Docman
           end
         end
       end
-      data
+      i
     end
 
 

data/lib/docman/docroot_controller.rb

@@ -3,23 +3,21 @@ require 'docman/builders/common_builder'
 require 'docman/builders/git_builder'
 require 'docman/deployers/deployer'
 require 'docman/deployers/git_deployer'
-require 'docman/deployers/local_deployer'
+require 'docman/deployers/common_deployer'
 
-# TODO: refactor info into class.
 # TODO: make universal logging class.
 
 module Docman
   class DocrootController
 
-    attr_reader :docroot_dir, :temp_dir
+    attr_reader :docroot_dir
 
     def initialize(docroot_dir, deploy_target_name, options = {})
       @deploy_target = Docman::Application.instance.config['deploy_targets'][deploy_target_name]
       Docman::Application.instance.deploy_target = @deploy_target
       docroot_config = DocrootConfig.new(docroot_dir, @deploy_target)
-      @deployer = Object.const_get("Docman::Deployers::#{@deploy_target['handler']}").new(@deploy_target)
+      @deployer = Docman::Deployers::Deployer.create(@deploy_target['handler'], @deploy_target)
       @docroot_dir = docroot_dir
-      @temp_dir = File.join(docroot_dir, 'tmp')
       @docroot_config = docroot_config
     end
 
@@ -36,11 +34,11 @@ module Docman
       @deployer.push(@docroot_config.root_dir, state)
     end
 
-    def build_recursive(state, dir = nil)
-      dir = dir ? dir : @docroot_config.structure
-      build_dir(state, dir[:info])
+    def build_recursive(state, info = nil)
+      info = info ? info : @docroot_config.structure
+      build_dir(state, info)
 
-      dir[:children].each do |child|
+      info['children'].each do |child|
         build_recursive(state, child)
       end
     end

data/lib/docman/info.rb

@@ -26,7 +26,7 @@ module Docman
       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}
+      File.open(File.join(self['full_build_path'], 'info.yaml'), 'w') {|f| f.write to_save.to_yaml}
     end
 
     def need_rebuild?

data/lib/docman/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docman
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Alexander Tolstikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-03 00:00:00.000000000 Z
+date: 2014-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -111,9 +111,9 @@ files:
 - lib/docman/builders/common_builder.rb
 - lib/docman/builders/git_builder.rb
 - lib/docman/cli.rb
+- lib/docman/deployers/common_deployer.rb
 - lib/docman/deployers/deployer.rb
 - lib/docman/deployers/git_deployer.rb
-- lib/docman/deployers/local_deployer.rb
 - lib/docman/docroot_config.rb
 - lib/docman/docroot_controller.rb
 - lib/docman/exec.rb