momentum 0.0.14 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64ff329b5fa672c7ea3247b0a5b4a6687df752ab
-  data.tar.gz: 3812ee59bb97d73e916bfa04a0f586cc10e30ac7
+  metadata.gz: 75030c1823b744f72565ac6da017851f6279e088
+  data.tar.gz: 5a5b48ed310ff98a0fc405a89a638fa851330947
 SHA512:
-  metadata.gz: 2fca491068125b4ab1bc09edffd17509f549dcf0f221329cd8536516843c5f4ff91459e52b2bb7b66d31e1d9a5714e89163f1fae767b314ef79ea7ab95f95797
-  data.tar.gz: 8c85777e49815c975aff17e7d48748ff18bde3e2a950d83080411b54ab75a1826f46e03e566296f783a2822fdb5104bfc94eb0d88d18d16239c0ddad7340a25b
+  metadata.gz: f59c18802d31636c5c244ca4c0cf4352a0d89dcf92b1f7ea2c08bb53bec077424da2013bcd01eb0cf40a37a9aa69a46b431f7daa65eb0afa4af89e0b3ac8d9e6
+  data.tar.gz: b2538f64727cbd9adcd0dee58b906cae7356200bb3ca306761563c9a0a91784951bedcf51354f2f869a5f1ecc4856a88db537b78d110242dc7a8694ae4329e4e

data/CHANGELOG.md

@@ -1,7 +1,7 @@
-0.0.14 (2017-07-14)
+0.1.0 (2016-01-18)
 ------
 
-* Allow user to specify remote env variables for their console session ([24](https://github.com/artsy/momentum/pull/24))
+* Update momentum to use Berkshelf and load rake tasks from non-Rails projects ([#19](https://github.com/artsy/momentum/pull/19))  Breaking changes: (1) librarian-chef has been replaced by berkshelf so any Cheffile must be converted to a Berksfile (2) The expected value for `Momentum.config[:cookbooks_install_path]` includes the cookbook package filename, which must be of the type `.tgz` i.e. the default value `cookbooks.tgz`
 
 0.0.13 (2016-01-18)
 ------

data/README.md

@@ -20,13 +20,17 @@ In your application's Rakefile, add this line above the `load_tasks` command:
       # momentum should only be installed in development
     end
 
-And then execute:
+If you arent's using Rails / don't have access to the `load_tasks` command, you can load all rake tasks by adding `require 'momentum/rake'` to your project's Rakefile.
+
+Finally, execute:
 
     $ bundle
-    $ gem install librarian-chef  # ideally this would be in the bundle, but has conflicts
-    $ bundle exec rake momentum:init
 
 
+## Berkshelf
+
+Momentum uses [Berkshelf](http://berkshelf.com/) to package application cookbooks and expects a `Berksfile` present in the top-level of your project.
+
 ## Naming
 
 It's assumed that stacks are named with an app name and modifier, such as _todo-production_. The modifier is usually an environment, but might also be a developer name or some other label, such _todo-joey_.
@@ -35,10 +39,6 @@ It's assumed that stacks are named with an app name and modifier, such as _todo-
 
 This gem adds a few useful rake tasks to your project. By default, the `aws_id` and `aws_secret` arguments are taken from `AWS_ID` and `AWS_SECRET` ENV variables. The `to` argument refers to the modifier mentioned above (e.g., _production_). It's appended to the configured `app_base_name` to form the stack name.
 
-### momentum:init
-
-Initialize a default librarian-chef config.
-
 ### ow:config[to,aws_id,aws_secret]
 
 Print the custom configuration values for the given stack. E.g.:
@@ -51,7 +51,7 @@ 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] [env ...]
+### ow:console[to,env,aws_id,aws_secret]
 
 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.:
 
@@ -61,13 +61,9 @@ 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]
 
-Zip, upload, and propagate custom cookbooks to the given stack. Or, more concisely:
+Package, upload, and propagate custom cookbooks to the given stack. Or, more concisely:
 
     bundle exec rake ow:cookbooks:update[staging]
     # or just:
@@ -99,7 +95,7 @@ SSH to an OpsWorks instance. If the `layer_or_instance` argument is a layer, an
 
 ### ow:execute_recipe[to,layer,recipe,aws_id,aws_secret]
 
-Execute a Chec 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-app_ layer, or the list configured in `app_layers`. E.g.:
 
     bundle exec rake ow:execute_recipe[staging,rails-app,restart_unicorns]
     # Assuming 'restart_unicorns' is a valid Chef recipe.
@@ -109,7 +105,7 @@ Execute a Chec recipe on the given layer in the given stack. By default, will ex
 
 * **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']`
-* **cookbooks_install_path** - Local path where librarian-chef will install cookbooks. Default: _tmp/cookbooks_
+* **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_
 
@@ -117,7 +113,6 @@ Execute a Chec recipe on the given layer in the given stack. By default, will ex
 ## To Do
 
 * git/branch helpers
-* Integrate librarian-chef as legit dependency once rails/chef conflicts resolved
 * Tests
 
 

data/lib/momentum/opsworks.rb

@@ -1,7 +1,7 @@
 module Momentum::OpsWorks
 
   def self.client(aws_id, aws_secret)
-    raise "You must specify aws_id and aws_secret!" unless aws_id.present? && aws_secret.present?
+    raise "You must specify aws_id and aws_secret!" if aws_id.nil? || aws_secret.nil?
     require 'aws-sdk'
     AWS::OpsWorks::Client.new(access_key_id: aws_id, secret_access_key: aws_secret)
   end
@@ -16,9 +16,9 @@ module Momentum::OpsWorks
     client.describe_apps(stack_id: stack[:stack_id])[:apps].detect { |a| a[:name] == app_name }
   end
 
-  # apparently, public_dns is not always set, fallback to elastic_ip (if available!)
+  # apparently, public_dns is not always set, fallback to elastic_ip (if available!) else private_dns
   def self.get_instance_endpoint(instance)
-    instance[:public_dns] || instance[:elastic_ip]
+    instance[:public_dns] || instance[:elastic_ip] || instance[:private_dns]
   end
 
   def self.get_layers(client, stack, layer_names)

data/lib/momentum/railtie.rb

@@ -3,8 +3,6 @@ class Momentum::Railtie < ::Rails::Railtie
   railtie_name :momentum
 
   rake_tasks do
-    load 'tasks/init.rake'
-    load 'tasks/librarian.rake'
     load 'tasks/ow-config.rake'
     load 'tasks/ow-console.rake'
     load 'tasks/ow-cookbooks.rake'

data/lib/momentum/rake.rb

@@ -0,0 +1,2 @@
+# Helper to load all rake tasks - to be required in other Rakefiles
+Dir.glob(File.expand_path("../../tasks/*.rake", __FILE__)) { |file| load file }

data/lib/momentum/tasks.rb

@@ -7,17 +7,13 @@ def require_credentials!(args)
 end
 
 def cookbooks_s3_key(to)
-  "#{stack_name(to)}.zip"
+  "#{stack_name(to)}.tgz"
 end
 
 def stack_name(to)
   "#{Momentum.config[:app_base_name]}-#{to}"
 end
 
-def cookbooks_zip
-  "#{Momentum.config[:cookbooks_install_path]}.zip"
-end
-
 def system!(command)
   success = system(command)
   fail "Failed with status #{$?.exitstatus}" unless success

data/lib/momentum/version.rb

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

data/lib/momentum.rb

@@ -5,7 +5,7 @@ module Momentum
 
   DEFAULT_CONFIG = {
     # app_base_name: ...,  # required
-    cookbooks_install_path: 'tmp/cookbooks',
+    cookbooks_install_path: 'tmp/cookbooks.tgz',
     custom_cookbooks_bucket: 'artsy-cookbooks',
     rails_console_layer: 'rails-app',
     app_layers: ['rails-app'],

data/lib/tasks/ow-console.rake

@@ -16,12 +16,8 @@ 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 << "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 && env #{env.join(" ")} bundle exec rails console\"'"
+    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\"'"
     sh Momentum::OpsWorks.ssh_command_to(endpoint,command)
   end
 

data/lib/tasks/ow-cookbooks.rake

@@ -4,30 +4,21 @@ namespace :ow do
     require 'momentum/opsworks'
     require 'momentum/tasks'
 
-    desc "Zip the #{Momentum.config[:cookbooks_install_path]} directory into #{Momentum.config[:cookbooks_install_path]}.zip"
-    task :zip do
-      raise "No cookbooks found at #{Momentum.config[:cookbooks_install_path]}! Run librarian-chef install." unless File.exists?(Momentum.config[:cookbooks_install_path])
-      dir = File.dirname(Momentum.config[:cookbooks_install_path])
-      base = File.basename(Momentum.config[:cookbooks_install_path])
-      system! "rm -f #{cookbooks_zip} && pushd #{dir} && zip -r #{base} #{base} && popd"
-      $stderr.puts "Zipped cookbooks to #{cookbooks_zip}"
-    end
-
-    desc "Upload custom cookbooks from #{cookbooks_zip} to S3 (at bucket/appname-env.zip)."
+    desc "Upload custom cookbooks from #{Momentum.config[:cookbooks_install_path]} to S3 (at bucket/appname-env.tgz)."
     task :upload, [:to, :aws_id, :aws_secret] => [:require_app_base_name] do |t, args|
       require_credentials!(args)
       require 'aws-sdk'
       AWS.config(access_key_id: args[:aws_id], secret_access_key: args[:aws_secret])
 
       key = cookbooks_s3_key(args[:to])
-      File.open(cookbooks_zip) do |zip|
-        AWS::S3.new.client.put_object bucket_name: Momentum.config[:custom_cookbooks_bucket], key: key, data: zip
+      File.open(Momentum.config[:cookbooks_install_path]) do |archive|
+        AWS::S3.new.client.put_object bucket_name: Momentum.config[:custom_cookbooks_bucket], key: key, data: archive
       end
-      $stderr.puts "Uploaded cookbooks.zip to #{Momentum.config[:custom_cookbooks_bucket]}/#{key}."
+      $stderr.puts "Uploaded #{Momentum.config[:cookbooks_install_path]} to #{Momentum.config[:custom_cookbooks_bucket]}/#{key}."
     end
 
-    desc "Install, zip and upload custom cookbooks, then trigger update_custom_cookbooks command."
-    task :update, [:to, :aws_id, :aws_secret] => [:require_app_base_name, 'librarian:install', :zip, :upload] do |t, args|
+    desc "Package and upload custom cookbooks, then trigger update_custom_cookbooks command."
+    task :update, [:to, :aws_id, :aws_secret] => [:require_app_base_name, :berks_package, :upload] do |t, args|
       require_credentials!(args)
 
       ow = Momentum::OpsWorks.client(args[:aws_id], args[:aws_secret])
@@ -47,7 +38,7 @@ namespace :ow do
 
     namespace :update do
       %w{staging production}.each do |env|
-        desc "Zip, upload, and propagate custom OpsWorks cookbooks to the #{env} stack."
+        desc "Package, upload, and propagate custom OpsWorks cookbooks to the #{env} stack."
         task(env.to_sym) { Rake::Task['ow:cookbooks:update'].invoke(env) }
       end
     end
@@ -56,5 +47,14 @@ namespace :ow do
       raise "An app_base_name must be configured!" unless Momentum.config[:app_base_name]
     end
 
+    task :berks_package do
+      require 'fileutils'
+      dirname = File.dirname(Momentum.config[:cookbooks_install_path])
+      unless File.directory?(dirname)
+        FileUtils.mkdir_p(dirname)
+      end
+      system! "berks package #{Momentum.config[:cookbooks_install_path]}"
+    end
+
   end
 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 "librarian-chef"  # rails/chef require incompatible json versions
+  spec.add_dependency "berkshelf", "~> 4.3.5"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

metadata

@@ -1,55 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: momentum
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.1.0
 platform: ruby
 authors:
 - Joey Aghion
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-14 00:00:00.000000000 Z
+date: 2016-07-26 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
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.3.5
 - !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.
@@ -59,7 +73,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -68,10 +82,9 @@ files:
 - lib/momentum.rb
 - lib/momentum/opsworks.rb
 - lib/momentum/railtie.rb
+- lib/momentum/rake.rb
 - lib/momentum/tasks.rb
 - lib/momentum/version.rb
-- lib/tasks/init.rake
-- lib/tasks/librarian.rake
 - lib/tasks/ow-config.rake
 - lib/tasks/ow-console.rake
 - lib/tasks/ow-cookbooks.rake
@@ -90,18 +103,19 @@ 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.5.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Utilities for working with OpsWorks apps in the style of Artsy Engineering.
 test_files: []
+has_rdoc: 

data/lib/tasks/init.rake

@@ -1,6 +0,0 @@
-namespace :momentum do
-
-  desc "Initialize a project with librarian-chef, etc."
-  task :init => ['librarian:config', 'librarian:init']
-
-end

data/lib/tasks/librarian.rake

@@ -1,34 +0,0 @@
-namespace :librarian do
-
-  LIBRARIAN_CONFIG = <<-EOF
----
-LIBRARIAN_CHEF_PATH: #{Momentum.config[:cookbooks_install_path]}
-LIBRARIAN_CHEF_INSTALL__STRIP_DOT_GIT: '1'
-  EOF
-
-  task :config do
-    FileUtils.mkdir_p './.librarian/chef'
-    File.open('./.librarian/chef/config', 'w+') do |f|
-      f.write(LIBRARIAN_CONFIG)
-    end
-    $stderr.puts "Wrote .librarian/chef/config"
-  end
-
-  task :init => :require do
-    # librarian-chef and rails declare incompatible json dependencies,
-    # so librarian-chef must be installed but can't be in the bundle
-    Bundler.with_clean_env do
-      system! "librarian-chef init"
-    end
-  end
-
-  task :install => :require do
-    Bundler.with_clean_env do
-      system! "librarian-chef install"
-    end
-  end
-
-  task :require do
-    raise "librarian-chef must be installed!" if `which librarian-chef`.empty?
-  end
-end