docman 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b1b4cfc708ee5329713f3b1e36a398aac0473f6
-  data.tar.gz: df7b6eaeb867c21a977bd493167118be064060bf
+  metadata.gz: f6162c342b2d3c1fd47954a3b4b1b1b13bceb220
+  data.tar.gz: 2df8cfefe00542382279e457e16e5da77c70d752
 SHA512:
-  metadata.gz: 5cec2483a759091c17a0506fdb6562af6c96aa2e70f9f5fc431b7c7885e5e211fea5e828c810a472f80083ed0815004260ec643a9db2965f0afd08c29cebedcc
-  data.tar.gz: c7d8b64781cfc782d2886a59aee59a886d4a440c72b521a8f7c687d038b4bbf3b802c39ccef21170bdc2735d5f7ac077fd87646b681e2388c90c9d0bf535cbb1
+  metadata.gz: 7dd9af90934dc99b3d641cf8112d42e706dd0201f57e67e49aa8e9a3b2e1fe3e379c40ec0f7816fb7730c96f592c5f9384abeb21adaa56ae30f5ec39d821fde3
+  data.tar.gz: 64639603503e5c1898fae7c4019960464f37ec6579a3191415c55e8533b167e82c54980b991ec64e077efed522ca3d11cec134083ebf48a5662650c0237d9fbe

data/config/config.yaml

@@ -11,11 +11,11 @@ deploy_targets:
         handler: :git_direct_builder
       dir:
         handler: :dir_builder
-    environments:
+    states:
       development: local
       staging: local
       stable: local
-  acquia:
+  git_target:
     handler: :git_deployer
     builders:
       root:
@@ -46,7 +46,11 @@ deploy_targets:
             after_execute:
               - type: :git_commit
                 execution_dir: $PROJECT$
-    environments:
+    states:
       development: dev
       staging: test
-      stable: test
+      stable: prod
+environments:
+  local:
+    deploy_target: local
+    state: development

data/features/{acquia/acquia.feature → git_target/git_target.feature}

@@ -1,4 +1,4 @@
-Feature: Docroot management - Acquia
+Feature: Docroot management - git_target
 
   In order to manage docroot
   As a developer using Cucumber
@@ -7,10 +7,10 @@ Feature: Docroot management - Acquia
   @announce
   @no-clobber
   @build
-  @acquia
-  Scenario: Acquia build development
+  @git_target
+  Scenario: git_target build development
     Given I cd to "sample-docroot"
-    Then I run `docman build acquia development`
+    Then I run `docman build git_target development`
     Then the exit status should be 0
     Then the following directories should exist:
       | master |
@@ -27,12 +27,12 @@ Feature: Docroot management - Acquia
 
   @announce
   @no-clobber
-  @acquia
+  @git_target
   @develop
   @deploy
-  Scenario: Acquia deploy sample project 1 develop
+  Scenario: git_target deploy sample project 1 develop
     Given I cd to "sample-docroot"
-    Then I run `docman deploy acquia sample_project1 branch develop`
+    Then I run `docman deploy git_target sample_project1 branch develop`
     Then the exit status should be 0
     Then the following directories should exist:
       | master |
@@ -46,13 +46,13 @@ Feature: Docroot management - Acquia
 
   @announce
   @no-clobber
-  @acquia
+  @git_target
   @deploy
   @master
   @sample_project2
-  Scenario: Acquia deploy sample project 2 master
+  Scenario: git_target deploy sample project 2 master
     Given I cd to "sample-docroot"
-    Then I run `docman deploy acquia sample_project2 branch master`
+    Then I run `docman deploy git_target sample_project2 branch master`
     Then the exit status should be 0
     Then the following directories should exist:
       | master |

data/lib/application.rb

@@ -69,7 +69,8 @@ module Docman
       params['state'] = state
       params['action'] = action
       params['name'] = name
-      params['environment'] = @deploy_target['environments'][state]
+      params['environment'] = @config['environments'][@deploy_target['states'][state]]
+      params['environment_name'] = @deploy_target['states'][state]
       Docman::Deployers::Deployer.create(params, nil, self).perform
     end
 

data/lib/docman/commands/command.rb

@@ -132,7 +132,7 @@ module Docman
       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
+      value.gsub! '$ENVIRONMENT$', @context.environment_name
     end
 
   end

data/lib/docman/commands/execute_script_cmd.rb

@@ -30,7 +30,7 @@ module Docman
       params.each do |param|
         case param
           when 'environment'
-            result << @context.environment
+            result << @context.environment_name
         end
       end
       result.join(' ')

data/lib/docman/commands/ssh_target_checker.rb

@@ -6,7 +6,7 @@ module Docman
     register_checker :ssh
 
     def execute
-      filename = File.join(self['file_path'], @context['docroot_name'] + @context['environment'], self['filename'])
+      filename = File.join(self['file_path'], self['filename'])
       Net::SFTP.start(self['ssh_host'], self['ssh_user']) do |sftp|
         n = 0
         begin

data/lib/docman/deployers/deployer.rb

@@ -33,6 +33,7 @@ module Docman
         @docroot_config = caller.docroot_config
         @builded = []
         @build_results = {}
+        @environments = Docman::Application.instance.config['envoronments']
       end
 
       def config
@@ -94,8 +95,8 @@ module Docman
       end
 
       def files_deployed?(version, filename)
-        return true unless self.has_key? 'target_checker'
-        params = self['target_checker']
+        return true unless self['environment'].has_key? 'target_checker'
+        params = self['environment']['target_checker']
         params['version'] = version
         params['filename'] = filename
         Docman::TargetChecker.create(params, self).perform

data/lib/docman/info.rb

@@ -98,8 +98,8 @@ module Docman
       []
     end
 
-    def environment
-      self['docroot_config'].deploy_target['environments'][self['state']]
+    def environment_name
+      self['docroot_config'].deploy_target['states'][self['state']]
     end
 
   end

data/lib/docman/version.rb

@@ -1,3 +1,3 @@
 module Docman
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docman
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Alexander Tolstikov
@@ -161,7 +161,7 @@ files:
 - config/config.yaml
 - config/cucumber.yml
 - docman.gemspec
-- features/acquia/acquia.feature
+- features/git_target/git_target.feature
 - features/init/init.feature
 - features/local/local.feature
 - features/local/local_deploy.feature
@@ -221,7 +221,7 @@ signing_key:
 specification_version: 4
 summary: Docman made for DOCroot MANagement for Drupal projects
 test_files:
-- features/acquia/acquia.feature
+- features/git_target/git_target.feature
 - features/init/init.feature
 - features/local/local.feature
 - features/local/local_deploy.feature