conan_deploy 0.0.3 → 0.0.4

data/README.md

@@ -7,14 +7,14 @@ This project provides automation for a [deployment pipeline](http://martinfowler
 
 Applications are deployed from a Sonotype Nexus artifact repository, and not from the source repository. Java applications must be executable jars, and must the provide deployment resources needed in the jar. Ruby apps (Rails or otherwise) must be vendored and packaged as a tar ball, with a compatible structrue to provide the deployment resources.
 
-Application artifacts are idenitifed and provisioned by Maven coordinates - group id, artifact id, packaging and version. The most recent version available on the repository will be used, or a promotion workflow along the pipeline(s) can be implemented by pinning the versions. Artifacts are pinned by keeping the build meta-data in an `environments` directory structure that mirrors the configuration model, which should be commited to version control after successful deployment and testing. _At this time, the `environments` directory and the `manifest.rb` are located from the execution directory, which is assumed to be the [nexus-apps-manifest](https://github.com/MTNSatelliteComm/nexus-app-manifest) project._
+Application artifacts are idenitifed and provisioned by Maven coordinates - group id, artifact id, packaging and version. The most recent version available on the repository will be used, or a promotion workflow along the pipeline(s) can be implemented by pinning the versions. Artifacts are pinned by keeping the build meta-data in an `environments` directory structure that mirrors the configuration model, which should be commited to version control after successful deployment and testing. _At this time, the `environments` directory and the `environments.rb` are located from the execution directory, which is assumed to be the [nexus-apps-manifest](https://github.com/MTNSatelliteComm/nexus-app-manifest) project._
 
 Conan is also designed to be idempotent. It can be executed against a target deployment over and over, and it should not change an application unless it out of alignment with the configuration model. Applications are also assumed to support standard set of managments APIs which provide build metadata, and health to support this.
 
 
 #Configuration
 
-Configuration for the deployment pipline is loaded through a DSL which models a target environment(s). The DSL is loaded from a `manifest.rb` file that should be provided in the execution directory.  
+Configuration for the deployment pipline is loaded through a DSL which models a target environment(s). The DSL is loaded from a `environments.rb` file that should be provided in the execution directory.  
 
 ```ruby
   pipeline(:'team1') {
@@ -174,6 +174,13 @@ deploy.org = "mtn"
 deploy.ship = "minnow1"
 deploy_name = "foo-dev-minnow1"
 ```
+
+App tokens for oauth are a special case, and assigned to special keys that will look something like:
+```
+oauth_id = application-gs8f8ae6-64a9-c987-c470-9c18b6fb918d
+oauth_secret = "4z3r6e779455d89db8896b3f4d8c2369ae71e9ca662abb366eea905a41de1dcf"
+```
+
 The are also a number of shortcuts provided for shorter keys:
 ```
 app_id => app.id

data/lib/conan/deploy.rb

@@ -8,7 +8,7 @@ module Conan
       puts "> Environment: #{env}"
 
       manifest = ManifestBuilder.build(options, pl, env) {
-        m = File.join(options[:directory], 'manifest.rb')
+        m = File.join(options[:directory], 'environments.rb')
         puts "> Manifest: #{m}"
         instance_eval(File.read(m), m)
       }

data/lib/conan/manifest_builder.rb

@@ -3,6 +3,7 @@ require 'rexml/document'
 require 'properties-ruby'
 require 'json'
 require 'securerandom'
+require 'daphne_util'
 
 require 'conan/output'
 require 'conan/repository'
@@ -10,7 +11,7 @@ require 'conan/stackato'
 require 'conan/newrelic'
 
 module ManifestBuilder
-  def self.build(options, pipeline_id, env_id, artifact_repo=nil, outthingy=nil, &block)    
+  def self.build(options, pipeline_id, env_id, artifact_repo=nil, outthingy=nil, &block)
     manifest_dir = options[:directory]
     output_type = options[:format]
 

data/lib/conan/output.rb

@@ -1,3 +1,4 @@
+require 'daphne_util'
 require 'conan/templates'
 
 class OutThingy
@@ -80,10 +81,20 @@ class StackatoOutThingy < OutThingy
     if (deploy.enabled?)      
       target_dir = workingDir(app)
       templates_dir = File.join(target_dir, "deploy-templates")
+
+      daphne_tokens = [ "#{app.id}", "#{deploy.environment.id}" ] 
+      daphne_tokens = daphne_tokens << "facility-#{deploy.facility_id}" unless deploy.facility_id.nil?
+        
       n_changes = Templates.evaluate templates_dir, target_dir, {
         :app => app,
         :deploy => deploy,
 
+        #daphne, generate oauth app tokens
+        #TODO: seems like this should be refactored
+        :oauth_id => DaphneUtil.generate_id(*daphne_tokens),
+        :oauth_secret => DaphneUtil.generate_secret(*daphne_tokens),
+        :api_key => DaphneUtil.generate_api_key(*daphne_tokens),
+
         # short-cuts          
         :app_id => app.id,
         :deploy_base_name => deploy.name(app.id),

data/lib/conan/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conan_deploy
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,8 +10,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-10 00:00:00.000000000 Z
-dependencies: []
+date: 2014-04-16 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: daphne_util
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 description: Provision, configure, deploy and never hear da lamantation of da users
 email: michael.reardon@mtnsat.com
 executables: