docman 0.0.36 → 0.0.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6250b7c21d8388051caea6b99f126f1b89ad6be3
-  data.tar.gz: ab0938c8baccb720ab0eaea267e5a59be25ec3e1
+  metadata.gz: cbf50429d5f634c8850f119dbec72555fb2956b0
+  data.tar.gz: ebb811dc89b506288b36f4b45b21d41994c27518
 SHA512:
-  metadata.gz: 77003d11c11b17a0b6335294a21ee9331622c899a9674475acd21cdf053fb6a9191d714aa097fe8ce8d597f5884fc55326a24e01da27ae6ba36bcd7c244cb12c
-  data.tar.gz: 4fd112f5d7435654fb79b00e3ec78dc1d49d06ca52e995f341aeab328b877c2467a6d04d3b6034bc659c093204dc2a549d65a123ea4238d00b34a049447431f2
+  metadata.gz: fc4f2f628e8f3f48cac6f7563ec57a247ee563fd833d4fcf51f7eba73ec564654e2b79d0471fcc18be4aa809a46dd927a906a070134e4e86c33826b3f8b6d78e
+  data.tar.gz: 2e014ecf61751db071d0cacff9491c92e96b9802dd4a65c3c1eb60382ccbd8caae41698c51090dd8de1c6a1250d820d65a5e57905578bdc978719bd9ab7f0e80

data/README.md

@@ -6,31 +6,30 @@ Notes: we are speaking about the code only, media files should be managed separa
 
 ## Installation
 
-Add this line to your application's Gemfile:
+    $ gem install docman
 
-    gem 'docman'
+## Usage (in process of documentation)
 
-And then execute:
+Init local environment:
 
-    $ bundle
+    $ docman init <project-dir> <config-repo> # Template: https://github.com/Adyax/docman-config
 
-Or install it yourself as:
+Build local environment:
 
-    $ gem install docman
+    $ docman build local environment
 
-## Usage (in process of documentation)
 
-Build local environment:
+Work on your website!
 
-    $ docman build local environment
+
+Bump your production version:
+
+    $ docman bump 
 
 Build the destination docroot using your settings:
 
     $ docman build <docroot> stable
 
-Deploy built docroot (Drupal core with multiple websites in multisite) to your environment:
-
-    $ docman deploy <docroot>
 
 ## Contributing
 

data/lib/docman/commands/command.rb

@@ -129,11 +129,11 @@ module Docman
     end
 
     def replace_placeholder(value)
-      value.gsub! '$ROOT$', @context['docroot_config'].root['full_build_path']
-      value.gsub! '$DOCROOT$', @context['docroot_config'].docroot_dir
-      value.gsub! '$PROJECT$', @context['full_build_path']
-      value.gsub! '$INFO$', @context['full_path']
-      value.gsub! '$ENVIRONMENT$', @context.environment_name
+      value.gsub!('$ROOT$', @context['docroot_config'].root['full_build_path']) unless @context['docroot_config'].root['full_build_path'].nil?
+      value.gsub!('$DOCROOT$', @context['docroot_config'].docroot_dir) unless @context['docroot_config'].docroot_dir.nil?
+      value.gsub!('$PROJECT$', @context['full_build_path']) unless @context['full_build_path'].nil?
+      value.gsub!('$INFO$', @context['full_path']) unless @context['full_path'].nil?
+      value.gsub!('$ENVIRONMENT$', @context.environment_name) unless @context.environment_name.nil?
     end
 
   end

data/lib/docman/info.rb

@@ -22,7 +22,7 @@ module Docman
             if state['source']['type'] == :retrieve_from_repo
               repo = state['source']['repo'] == :project_repo ? self['repo'] : state['source']['repo']
               external_state_info = read_yaml_from_file(repo, self['states_path'], state['source']['branch'], state['source']['file'])
-              state.deep_merge! external_state_info unless external_state_info.nil?
+              state.deep_merge! external_state_info unless external_state_info.nil? or state.nil?
             end
           end
         end

data/lib/docman/version.rb

@@ -1,3 +1,3 @@
 module Docman
-  VERSION = "0.0.36"
+  VERSION = "0.0.37"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docman
 version: !ruby/object:Gem::Version
-  version: 0.0.36
+  version: 0.0.37
 platform: ruby
 authors:
 - Alexander Tolstikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-23 00:00:00.000000000 Z
+date: 2014-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler