momentum 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 75030c1823b744f72565ac6da017851f6279e088
-  data.tar.gz: 5a5b48ed310ff98a0fc405a89a638fa851330947
+SHA256:
+  metadata.gz: 188d6dcc70370d5f9c3734f0e6f8c95b41b97127a1dbcf19619dc5d29d7b55d6
+  data.tar.gz: a3deddd536d477d8b008bef0ca424342663135f801647c4517e2dd161f022fb8
 SHA512:
-  metadata.gz: f59c18802d31636c5c244ca4c0cf4352a0d89dcf92b1f7ea2c08bb53bec077424da2013bcd01eb0cf40a37a9aa69a46b431f7daa65eb0afa4af89e0b3ac8d9e6
-  data.tar.gz: b2538f64727cbd9adcd0dee58b906cae7356200bb3ca306761563c9a0a91784951bedcf51354f2f869a5f1ecc4856a88db537b78d110242dc7a8694ae4329e4e
+  metadata.gz: 8a40aceb902d8b1de5d41d36132d77b84550ff2b89bf1294d82ef220ea825e1b57413716d515d2004659d836154972fe602dc7a9e5d7e8d89463996a0946fe50
+  data.tar.gz: ec2740730db39e579798002ba496cbae38a9d43c0b0bdbfc60367324fd24c1331d45d460547de7151aeba3d846e635b9f127d069978d132cd42d0797d9588d0a

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+0.1.1 (2018-02-01)
+------
+
+* Allow user to specify remote env variables for their console session ([23](https://github.com/artsy/momentum/pull/23))
+
 0.1.0 (2016-01-18)
 ------
 

data/README.md

@@ -51,9 +51,9 @@ Add the given stack's custom configuration values to the current task's ENV. Can
 
     bundle exec rake ow:config:from_env[production] some:migration
 
-### ow:console[to,env,aws_id,aws_secret]
+### ow:console[to,env,aws_id,aws_secret] [env ...]
 
-Start a rails console on the given remote OpsWorks stack. Chooses an instance of the _rails-app_ layer by default, or the configured `rails_console_layer` if provided. E.g.:
+Start a rails console on the given remote OpsWorks stack. Chooses an instance of the _rails_ layer by default, or the configured `rails_console_layer` if provided. E.g.:
 
     bundle exec rake ow:console[production]
 
@@ -61,6 +61,10 @@ For stacks with labels not matching the Rails environment (e.g., _reflection-joe
 
     bundle exec rake ow:console[joey,staging]
 
+To set environment variables for the remote process, specify them _after_ the task name like you normally would with rake tasks:
+
+    bundle exec rake ow:console[production] SOME_ENV_VARIABLE=set-remotely
+
 ### ow:cookbooks:update[to,aws_id,aws_secret]
 
 Package, upload, and propagate custom cookbooks to the given stack. Or, more concisely:
@@ -69,21 +73,19 @@ Package, upload, and propagate custom cookbooks to the given stack. Or, more con
     # or just:
     bundle exec rake ow:cookbooks:update:staging
 
-### ow:deploy[to,migrate_db,aws_id,aws_secret]
+### ow:deploy[to,aws_id,aws_secret]
 
-Trigger an OpsWorks deploy to the given stack. By default, deploys app to all running instances of the _rails-app_ layer, or the list configured in `app_layers`. E.g.:
+Trigger an OpsWorks deploy to the given stack. By default, deploys app to all running instances of the _rails_ layer, or the list configured in `app_layers`. E.g.:
 
     bundle exec rake ow:deploy[staging]
     # or just:
     bundle exec rake ow:deploy:staging
-    # if you want to trigger database migrations at the same time, add the additional flag
-    bundle exec rake ow:deploy:migrations[staging]
 
 ### ow:logs[to,instance,log_path,aws_id,aws_secret]
 
 Execute a tail -f (follow) command against a remote log path on the given remote OpsWorks instance and stack. The path may include wildcards. E.g.:
 
-    bundle exec rake ow:logs[staging,rails-app1,/srv/www/myapp/shared/log/staging.log]
+    bundle exec rake ow:logs[staging,rails1,/home/deploy/myapp/shared/log/staging.log]
 
 ### ow:ssh[to,layer_or_instance,aws_id,aws_secret]
 
@@ -91,23 +93,23 @@ SSH to an OpsWorks instance. If the `layer_or_instance` argument is a layer, an
 
     bundle exec rake ow:ssh[staging,memcached]
     # or...
-    bundle exec rake ow:ssh[staging,rails-app1]
+    bundle exec rake ow:ssh[staging,rails1]
 
 ### ow:execute_recipe[to,layer,recipe,aws_id,aws_secret]
 
-Execute a Chef recipe on the given layer in the given stack. By default, will execute recipes on all running instances of the _rails-app_ layer, or the list configured in `app_layers`. E.g.:
+Execute a Chef recipe on the given layer in the given stack. By default, will execute recipes on all running instances of the _rails_ layer, or the list configured in `app_layers`. E.g.:
 
-    bundle exec rake ow:execute_recipe[staging,rails-app,restart_unicorns]
+    bundle exec rake ow:execute_recipe[staging,rails,restart_unicorns]
     # Assuming 'restart_unicorns' is a valid Chef recipe.
 
 
 ## Configuration:
 
 * **app_base_name** - Your app's name. Stacks are assumed to be named like _appbasename-env_ (e.g., _gravity-staging_ or _reflection-joey_).
-* **app_layers** - Array of OpsWorks layer names to which this rails app should be deployed. Default: `['rails-app']`
+* **app_layers** - Array of OpsWorks layer names to which this rails app should be deployed. Default: `['rails']`
 * **cookbooks_install_path** - Local path where berkshelf will install cookbooks. Default: _tmp/cookbooks.tgz_
 * **custom_cookbooks_bucket** - Bucket to which custom cookbooks are uploaded. Default: _artsy-cookbooks_
-* **rails_console_layer** - The OpsWorks layer used for SSH-ing and starting a rails console. Default: _rails-app_
+* **rails_console_layer** - The OpsWorks layer used for SSH-ing and starting a rails console. Default: _rails_
 
 
 ## To Do

data/lib/momentum.rb

@@ -7,9 +7,11 @@ module Momentum
     # app_base_name: ...,  # required
     cookbooks_install_path: 'tmp/cookbooks.tgz',
     custom_cookbooks_bucket: 'artsy-cookbooks',
-    rails_console_layer: 'rails-app',
-    app_layers: ['rails-app'],
-    logs_root: '/var/log/apache2/'
+    rails_console_layer: 'rails',
+    app_layers: ['rails'],
+    logs_root: '/var/log/nginx/',
+    deploy_root: '/home/deploy',
+    append_path: ''
   }
 
   def self.config

data/lib/momentum/opsworks.rb

@@ -52,19 +52,7 @@ module Momentum::OpsWorks
 
     def self.load_from_stack(client, stack_name, app_name)
       stack = Momentum::OpsWorks.get_stack(client, stack_name)
-      JSON.parse(stack[:custom_json])["custom_env"][app_name].tap do |config|
-
-        # Custom config from OpsWorks doesn't include RAILS_ENV, so add it.
-        config['RAILS_ENV'] = Momentum::OpsWorks.get_app(client, stack, app_name)[:attributes]['RailsEnv']
-
-        # Set MEMCACHE_SERVERS if memcached server configured
-        if (memcached_layer = Momentum::OpsWorks.get_layers(client, stack, ['memcached']).first) &&
-          (memcached_instance = Momentum::OpsWorks.get_online_instances(client, layer_id: memcached_layer[:layer_id]).first)
-          config['MEMCACHE_SERVERS'] = memcached_instance[:private_ip]
-          config['MEMCACHE_SERVERS_PUBLIC'] = Momentum::OpsWorks.get_instance_endpoint(memcached_instance)
-        end
-
-      end
+      JSON.parse(stack[:custom_json])["custom_env"][app_name]
     end
 
   end
@@ -98,7 +86,7 @@ module Momentum::OpsWorks
       )
     end
 
-    def deploy!(stack_name, migrate_db = false, app_name = Momentum.config[:app_base_name])
+    def deploy!(stack_name, app_name = Momentum.config[:app_base_name])
       stack = Momentum::OpsWorks.get_stack(@ow, stack_name)
       app = Momentum::OpsWorks.get_app(@ow, stack, app_name)
       layers = Momentum::OpsWorks.get_layers(@ow, stack, Momentum.config[:app_layers])
@@ -108,10 +96,7 @@ module Momentum::OpsWorks
         stack_id: stack[:stack_id],
         app_id: app[:app_id],
         command: {
-          name: 'deploy',
-          args: {
-            'migrate' => [migrate_db.to_s]
-          }
+          name: 'deploy'
         },
         instance_ids: instance_ids
       )

data/lib/momentum/version.rb

@@ -1,3 +1,3 @@
 module Momentum
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/tasks/ow-console.rake

@@ -16,8 +16,13 @@ namespace :ow do
     endpoint = Momentum::OpsWorks.get_instance_endpoint(instance)
     raise "No online '#{Momentum.config[:rails_console_layer]}' instances found for #{name} stack!" unless endpoint
 
+    env = ARGV.grep(/^(\w+)=(.*)$/m)
+    env << "PATH=$PATH:#{Momentum.config[:append_path]}"
+    env << "RAILS_ENV=#{args[:env] || args[:to]}"
+    env << "RUBYOPT=-EUTF-8"
+
     $stderr.puts "Starting remote console... (use Ctrl-D to exit cleanly)"
-    command = "'sudo su deploy -c \"cd /srv/www/#{Momentum.config[:app_base_name]}/current && RAILS_ENV=#{args[:env] || args[:to]} RUBYOPT=-EUTF-8 bundle exec rails console\"'"
+    command = "'sudo su - deploy -c \"cd #{Momentum.config[:deploy_root]}/#{Momentum.config[:app_base_name]}/current && env #{env.join(" ")} bundle exec rails console\"'"
     sh Momentum::OpsWorks.ssh_command_to(endpoint,command)
   end
 

data/lib/tasks/ow-deploy.rake

@@ -14,20 +14,8 @@ namespace :ow do
     require_credentials!(args)
     deployer = Momentum::OpsWorks::Deployer.new(args[:aws_id], args[:aws_secret])
     name = stack_name(args[:to])
-    deployment = deployer.deploy!(name, false)
+    deployment = deployer.deploy!(name)
     $stderr.puts "Triggered deployment #{deployment[:deployment_id]} to #{name}..."
     deployer.wait_for_success!(deployment)
   end
-
-  namespace :deploy do
-    desc "Deploy to the given OpsWorks stack and tigger database migrations."
-    task :migrations, [:to, :aws_id, :aws_secret] do |t, args|
-      require_credentials!(args)
-      deployer = Momentum::OpsWorks::Deployer.new(args[:aws_id], args[:aws_secret])
-      name = stack_name(args[:to])
-      deployment = deployer.deploy!(name, true)
-      $stderr.puts "Triggered deployment #{deployment[:deployment_id]} and database migrations to #{name}..."
-      deployer.wait_for_success!(deployment)
-    end
-  end
 end

data/lib/tasks/ow-logs.rake

@@ -14,7 +14,7 @@ namespace :ow do
     endpoint = Momentum::OpsWorks.get_instance_endpoint(instance)
 
     $stderr.puts "Starting tail -f remotely... (use Ctrl-D to exit cleanly)"
-    command = "'sudo su deploy -c \"tail -f #{args[:log_path]}\"'"
+    command = "'sudo su - deploy -c \"tail -f #{args[:log_path]}\"'"
     sh Momentum::OpsWorks.ssh_command_to(endpoint, command)
   end
 

data/momentum.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "aws-sdk", "~> 1.30"
-  spec.add_dependency "berkshelf", "~> 4.3.5"
+  spec.add_dependency "berkshelf", ">= 4.3"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: momentum
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Joey Aghion
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-26 00:00:00.000000000 Z
+date: 2018-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.30'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.30'
 - !ruby/object:Gem::Dependency
   name: berkshelf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.3.5
+        version: '4.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.3.5
+        version: '4.3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Utilities for working with OpsWorks apps in the style of Artsy Engineering.
@@ -73,7 +73,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -103,19 +103,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Utilities for working with OpsWorks apps in the style of Artsy Engineering.
 test_files: []
-has_rdoc: