lita-ey-deploy 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47b06676ac6fad381f37a7ab3c596429748d74fd
-  data.tar.gz: 130b27bf17759ee504fe937897b5eea3fb8e434d
+  metadata.gz: 324a2cc515df8474e5bf5fab341bed82435e3745
+  data.tar.gz: bdb8cb25d1dc67e25d7efa6d1f60ec221b7ce235
 SHA512:
-  metadata.gz: 36745002e9bb3628118e7a783579d5e58df4e4b03db7c78b34c726c7ddd4acdf32fdd294e6fec73cc2245fd9f9d8fdf02f21654ee38599cb9257f16222f4a028
-  data.tar.gz: 7f0f35f21d5ee1f7ec79a109f54f3f173a4c9fa35451d924acbf980b75c01881b346e4d0c7ee50b83b6b672e743a91d5df2e240a509b82c27cb8880ed9b8673e
+  metadata.gz: 45d03cda85b10268f17301668a69dd8d57893ffd615c9de86b5a3a82fc03a07a69adc0bf768f8c9a1cd9661a10cd33c5c677373077bc48e9d6a5956c27029136
+  data.tar.gz: 784ccca172548d77a13ff55681c28202234b63ee01461fea44890534c2475b4f3572d49d2de0dbf43cc45a12df52658a7cf2801f1dd5e687375c14abc512a2e3

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    lita-ey-deploy (0.0.4)
+    lita-ey-deploy (0.0.5)
       engineyard
       lita (>= 3.2.0)
+      lita-ey-base
 
 GEM
   remote: https://rubygems.org/
@@ -17,16 +18,15 @@ GEM
       thor
     diff-lcs (1.2.5)
     docile (1.1.3)
-    engineyard (2.3.3)
-      engineyard-cloud-client (~> 1.0.16)
+    engineyard (2.3.1)
+      engineyard-cloud-client (~> 1.0.14)
       engineyard-serverside-adapter (= 2.2.0)
       escape (~> 0.0.4)
       highline (~> 1.6.1)
       launchy (~> 2.1)
-      net-ssh (~> 2.7)
+      net-ssh (~> 2.2)
       rest-client (~> 1.6.0)
-    engineyard-cloud-client (1.0.16)
-      mime-types (~> 1.16)
+    engineyard-cloud-client (1.0.15)
       multi_json (~> 1.6)
       rest-client (~> 1.6.1)
     engineyard-serverside-adapter (2.2.0)
@@ -43,7 +43,7 @@ GEM
     ice_nine (0.11.0)
     launchy (2.4.2)
       addressable (~> 2.3)
-    lita (3.2.0)
+    lita (3.3.0)
       bundler (>= 1.3)
       faraday (>= 0.8.7)
       http_router (>= 0.11.1)
@@ -52,33 +52,38 @@ GEM
       multi_json (>= 1.7.7)
       puma (>= 2.7.1)
       rack (>= 1.5.2)
+      rb-readline (>= 0.5.1)
       redis-namespace (>= 1.3.0)
       thor (>= 0.18.1)
-    mime-types (1.25.1)
-    multi_json (1.10.0)
+    lita-ey-base (0.0.2)
+      engineyard
+      lita (>= 3.2.0)
+    mime-types (2.3)
+    multi_json (1.10.1)
     multipart-post (2.0.0)
     net-ssh (2.9.1)
     puma (2.8.2)
       rack (>= 1.1, < 2.0)
     rack (1.5.2)
     rake (10.3.2)
+    rb-readline (0.5.1)
     redis (3.0.7)
     redis-namespace (1.4.1)
       redis (~> 3.0.4)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    rspec (3.0.0.beta2)
-      rspec-core (= 3.0.0.beta2)
-      rspec-expectations (= 3.0.0.beta2)
-      rspec-mocks (= 3.0.0.beta2)
-    rspec-core (3.0.0.beta2)
-      rspec-support (= 3.0.0.beta2)
-    rspec-expectations (3.0.0.beta2)
+    rspec (3.0.0)
+      rspec-core (~> 3.0.0)
+      rspec-expectations (~> 3.0.0)
+      rspec-mocks (~> 3.0.0)
+    rspec-core (3.0.2)
+      rspec-support (~> 3.0.0)
+    rspec-expectations (3.0.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (= 3.0.0.beta2)
-    rspec-mocks (3.0.0.beta2)
-      rspec-support (= 3.0.0.beta2)
-    rspec-support (3.0.0.beta2)
+      rspec-support (~> 3.0.0)
+    rspec-mocks (3.0.2)
+      rspec-support (~> 3.0.0)
+    rspec-support (3.0.2)
     simplecov (0.8.2)
       docile (~> 1.1.0)
       multi_json
@@ -99,5 +104,5 @@ DEPENDENCIES
   coveralls
   lita-ey-deploy!
   rake
-  rspec (>= 3.0.0.beta1)
+  rspec (>= 3.0.0)
   simplecov

data/README.md

@@ -20,20 +20,20 @@ Add required configuration to lita_config.rb file:
   config.handlers.ey.api_token = "YOUR_EY_API_TOKEN"
   config.handlers.ey.apps = {
     "my_app_name_for_lita" => {
-      "name" => "my_app_name_at_ey",
+      "ey_name" => "my_app_name_at_ey",
       "envs" => {
         "test" => {
-          name: "testing",
+          ey_name: "my_app_testing",
           auth_group: "devs",
           default_branch: "develop"
         },
         "stage" => {
-          name: "staging",
+          ey_name: "my_app_staging",
           auth_group: "testers",
           default_branch: "stage"
         },
         "production" => {
-          name: "production",
+          ey_name: "my_app_production",
           auth_group: "devops",
           default_branch: "master"
         }
@@ -48,4 +48,4 @@ Add required configuration to lita_config.rb file:
 
 ## License
 
-[MIT](http://opensource.org/licenses/MIT)
+[MIT](http://opensource.org/licenses/MIT)

data/lib/lita/handlers/ey_deploy.rb

@@ -1,12 +1,6 @@
-require "lita"
-
 module Lita
   module Handlers
-    class EyDeploy < Handler
-
-      route(/ey deploy help/i, :help, command: true, help: {
-        "ey deploy help" => "Display list of apps and envs available, and groups authorized to deploy on them"
-      })
+    class EyDeploy < EyBase
 
       route(/ey deploy (\w*) (\w*)( [\w\/\.\-\_]*)?/i, :deploy, command: true, help: {
         "ey deploy [app] [env] <branch_name>" => "Deploy specified branch (or default) to a particular app env"
@@ -24,39 +18,15 @@ module Lita
         "ey maintenance off [app] [env]" => "Disable maintenance page at a particular app env"
       })
 
-      def self.default_config(config)
-        config.api_token = nil
-        config.apps = {}
-      end
-
-      def self.namespace
-        "ey"
-      end
-
-      def help(response)
-        result = ""
-        config.apps.each do |app_name, app_data|
-          result += "App Name: #{app_name}\n"
-          result += "  Environments:\n"
-          app_data["envs"].each do |env_name, env_data|
-            result += "    * #{env_name}\n"
-            result += "      Default branch: #{env_data["default_branch"]}\n"
-            result += "      Authorized users group: #{env_data["auth_group"]}\n"
-          end
-          result += "\n"
-        end
-        response.reply result
-      end
-
       def deploy(response)
-        app = response.matches[0][0].strip
-        env = response.matches[0][1].strip
+        app = response.matches[0][0]
+        env = response.matches[0][1]
 
         response.reply "Deploy what to where?" and return unless valid_app?(app) && valid_env?(app, env)
 
         branch = (response.matches[0][2] || default_branch_for(app, env)).strip
 
-        if can_deploy?(response.user, app, env)
+        do_if_can_access(response, app, env) do
           response.reply "Deploying #{app} branch '#{branch}' to #{env}"
 
           cmd = ey_deploy_cmd(app, env, branch)
@@ -65,8 +35,6 @@ module Lita
 
           feedback_msg = deploy_result.include?(ey_failure_msg) ? failed_msg : success_msg
           response.reply feedback_msg
-        else
-          response.reply access_denied % { group_name: required_group_to_access(app, env) }
         end
       end
 
@@ -76,7 +44,7 @@ module Lita
 
         response.reply "Rollback what?" and return unless valid_app?(app) && valid_env?(app, env)
 
-        if can_deploy?(response.user, app, env)
+        do_if_can_access(response, app, env) do
           response.reply "Rolling back #{app} #{env} to previous version..."
 
           cmd = ey_rollback_cmd(app, env)
@@ -84,8 +52,6 @@ module Lita
           result = `#{cmd}`
 
           response.reply result
-        else
-          response.reply access_denied % { group_name: required_group_to_access(app, env) }
         end
       end
 
@@ -95,7 +61,7 @@ module Lita
 
         response.reply "Place maintenance page where?" and return unless valid_app?(app) && valid_env?(app, env)
 
-        if can_deploy?(response.user, app, env)
+        do_if_can_access(response, app, env) do
           response.reply "Placing maintenance page at #{app} #{env}..."
 
           cmd = ey_maintenance_on_cmd(app, env)
@@ -103,8 +69,6 @@ module Lita
           result = `#{cmd}`
 
           response.reply result
-        else
-          response.reply access_denied % { group_name: required_group_to_access(app, env) }
         end
       end
 
@@ -114,7 +78,7 @@ module Lita
 
         response.reply "Disable maintenance page where?" and return unless valid_app?(app) && valid_env?(app, env)
 
-        if can_deploy?(response.user, app, env)
+        do_if_can_access(response, app, env) do
           response.reply "Disabling maintenance page at #{app} #{env}..."
 
           cmd = ey_maintenance_on_cmd(app, env)
@@ -122,28 +86,10 @@ module Lita
           result = `#{cmd}`
 
           response.reply result
-        else
-          response.reply access_denied % { group_name: required_group_to_access(app, env) }
         end
       end
 
-      def valid_app?(app)
-        config.apps.keys.include?(app)
-      end
-
-      def valid_env?(app, env)
-        config.apps[app]["envs"].keys.include?(env)
-      end
-
-      def can_deploy?(user, app, env)
-        group = required_group_to_access(app, env)
-        return true unless group
-        Lita::Authorization.user_in_group? user, required_group_to_access(app, env)
-      end
-
-      def required_group_to_access(app, env)
-        config.apps[app]["envs"][env]["auth_group"]
-      end
+    private
 
       def ey_deploy_cmd(app, env, branch)
         "bundle exec ey deploy --app='#{ey_app(app)}' --environment='#{ey_env(app, env)}' --ref='refs/heads/#{branch}' --migrate='rake db:migrate' --api-token=#{config.api_token}"
@@ -173,24 +119,8 @@ module Lita
         "Deployment failed! Shame on you!"
       end
 
-      def access_denied
-        "Sorry, you don't have access; you must be at %{group_name} group."
-      end
-
-      def default_branch_for(app, env)
-        config.apps[app]["envs"][env]["default_branch"] || "master"
-      end
-
-      def ey_app(app)
-        config.apps[app]["name"]
-      end
-
-      def ey_env(app, env)
-        config.apps[app]["envs"][env]["name"]
-      end
-
     end
 
     Lita.register_handler(EyDeploy)
   end
-end
+end

data/lib/lita-ey-deploy.rb

@@ -1 +1,3 @@
+require "lita"
+require "lita-ey-base"
 require "lita/handlers/ey_deploy"

data/lita-ey-deploy.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "lita-ey-deploy"
-  spec.version       = "0.0.4"
+  spec.version       = "0.0.5"
   spec.authors       = ["Carlos Paramio"]
   spec.email         = ["cparamio@avallain.com"]
   spec.description   = %q{A Lita handler for EngineYard deployments.}
@@ -16,10 +16,11 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "lita", ">= 3.2.0"
 
   spec.add_dependency "engineyard"
+  spec.add_dependency "lita-ey-base"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "coveralls"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec", ">= 3.0.0.beta1"
+  spec.add_development_dependency "rspec", ">= 3.0.0"
   spec.add_development_dependency "simplecov"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita-ey-deploy
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Carlos Paramio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-20 00:00:00.000000000 Z
+date: 2014-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lita
@@ -38,6 +38,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: lita-ey-base
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +100,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta1
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta1
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement