orats 0.6.4 → 0.6.5

data/lib/orats/templates/play.rb

@@ -21,8 +21,8 @@ end
 
 def log_task(message)
   puts
-  say_status  'task', "#{method_to_sentence(message.to_s)}:", :yellow
-  puts        '-'*80, ''; sleep 0.25
+  say_status 'task', "#{method_to_sentence(message.to_s)}:", :yellow
+  puts '-'*80, ''; sleep 0.25
 end
 
 def git_commit(message)
@@ -31,9 +31,9 @@ def git_commit(message)
 end
 
 def git_config(field)
-  command = "git config --global user.#{field}"
+  command         = "git config --global user.#{field}"
   git_field_value = run(command, capture: true).gsub("\n", '')
-  default_value = "YOUR_#{field.upcase}"
+  default_value   = "YOUR_#{field.upcase}"
 
   git_field_value.to_s.empty? ? default_value : git_field_value
 end
@@ -59,11 +59,12 @@ end
 def add_license
   log_task __method__
 
-  author_name = git_config 'name'
+  author_name  = git_config 'name'
   author_email = git_config 'email'
 
   run 'rm -rf LICENSE'
-  file 'LICENSE' do <<-S
+  file 'LICENSE' do
+    <<-S
 The MIT License (MIT)
 
 Copyright (c) #{Time.now.year} #{author_name} <#{author_email}>
@@ -86,7 +87,7 @@ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
 CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-  S
+    S
   end
   git_commit 'Add MIT license'
 end
@@ -94,7 +95,8 @@ end
 def add_main_playbook
   log_task __method__
 
-  file 'site.yml' do <<-S
+  file 'site.yml' do
+    <<-S
 ---
 - name: ensure all servers are commonly configured
   hosts: all
@@ -148,7 +150,7 @@ def add_main_playbook
     - { role: nickjj.pumacorn, tags: [app, rails] }
     - { role: nickjj.sidekiq, tags: [app, rails] }
     - { role: nickjj.monit, tags: [app, monit] }
-  S
+    S
   end
   git_commit 'Add the main playbook'
 end
@@ -162,15 +164,15 @@ end
 
 def log_complete
   puts
-  say_status  'success', "\e[1m\Everything has been setup successfully\e[0m", :cyan
+  say_status 'success', "\e[1m\Everything has been setup successfully\e[0m", :cyan
   puts
-  say_status  'question', 'Are most of your apps similar?', :yellow
-  say_status  'answer', 'You only need to generate one playbook and you just did', :white
-  say_status  'answer', 'Use the inventory in each project to customize certain things', :white
+  say_status 'question', 'Are most of your apps similar?', :yellow
+  say_status 'answer', 'You only need to generate one playbook and you just did', :white
+  say_status 'answer', 'Use the inventory in each project to customize certain things', :white
   puts
-  say_status  'question', 'Are you new to ansible?', :yellow
-  say_status  'answer', 'http://docs.ansible.com/intro_getting_started.html', :white
-  puts        '-'*80
+  say_status 'question', 'Are you new to ansible?', :yellow
+  say_status 'answer', 'http://docs.ansible.com/intro_getting_started.html', :white
+  puts '-'*80
 end
 
 # ---

data/lib/orats/version.rb

@@ -1,3 +1,3 @@
 module Orats
-  VERSION = '0.6.4'
+  VERSION = '0.6.5'
 end

data/orats.gemspec

@@ -4,14 +4,14 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'orats/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = 'orats'
-  spec.version       = Orats::VERSION
-  spec.authors       = ['Nick Janetakis']
-  spec.email         = ['nick.janetakis@gmail.com']
-  spec.summary       = %q{Opinionated rails application templates.}
-  spec.description   = %q{A collection of rails application templates using modern versions of Ruby on Rails. Launch new applications and the infrastructure to run them in seconds.}
-  spec.homepage      = 'https://github.com/nickjj/orats'
-  spec.license       = 'MIT'
+  spec.name        = 'orats'
+  spec.version     = Orats::VERSION
+  spec.authors     = ['Nick Janetakis']
+  spec.email       = ['nick.janetakis@gmail.com']
+  spec.summary     = %q{Opinionated rails application templates.}
+  spec.description = %q{A collection of rails application templates using modern versions of Ruby on Rails. Launch new applications and the infrastructure to run them in seconds.}
+  spec.homepage    = 'https://github.com/nickjj/orats'
+  spec.license     = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }

data/test/integration/cli_test.rb

@@ -19,7 +19,7 @@ class TestCLI < Minitest::Test
   end
 
   def test_new_app_with_auth
-    app_name = generate_app_name
+    app_name     = generate_app_name
     gemfile_path = "#{TEST_PATH}/#{app_name}/services/#{app_name}/Gemfile"
 
     out, err = capture_subprocess_io do
@@ -58,7 +58,7 @@ class TestCLI < Minitest::Test
     app_name = generate_app_name
 
     out, err = capture_subprocess_io do
-     orats "play #{app_name}"
+      orats "play #{app_name}"
     end
 
     assert_match /success/, out
@@ -91,45 +91,45 @@ class TestCLI < Minitest::Test
 
   private
 
-    def assert_nuked(app_name, options = {})
-      out, err = capture_subprocess_io do
-        orats "nuke #{app_name}", flags: options[:flags], answer: 'y'
-      end
-
-      assert_match /#{app_name}/, out
-      system 'rm -rf /tmp/orats'
+  def assert_nuked(app_name, options = {})
+    out, err = capture_subprocess_io do
+      orats "nuke #{app_name}", flags: options[:flags], answer: 'y'
     end
 
-    def assert_server_started
-      assert port_taken?
-    end
+    assert_match /#{app_name}/, out
+    system 'rm -rf /tmp/orats'
+  end
 
-    def assert_path_exists(file_or_dir)
-      assert File.exists?(file_or_dir), "Expected path '#{file_or_dir}' to exist"
-    end
+  def assert_server_started
+    assert port_taken?
+  end
 
-    def refute_path_exists(file_or_dir)
-      refute File.exists?(file_or_dir), "Expected path '#{file_or_dir}' to exist"
-    end
+  def assert_path_exists(file_or_dir)
+    assert File.exists?(file_or_dir), "Expected path '#{file_or_dir}' to exist"
+  end
 
-    def assert_in_file(file_path, regex)
-      out, err = capture_subprocess_io do
-        system "cat #{file_path}"
-      end
+  def refute_path_exists(file_or_dir)
+    refute File.exists?(file_or_dir), "Expected path '#{file_or_dir}' to exist"
+  end
 
-      assert_match regex, out
+  def assert_in_file(file_path, regex)
+    out, err = capture_subprocess_io do
+      system "cat #{file_path}"
     end
 
-    def ensure_port_is_free
-      skip 'Port 3000 is already in use, aborting test' if port_taken?
-    end
+    assert_match regex, out
+  end
 
-    def kill_server(stdout_text)
-      pid_lines = stdout_text.scan(/started with pid \d+/)
+  def ensure_port_is_free
+    skip 'Port 3000 is already in use, aborting test' if port_taken?
+  end
 
-      puma = pid_lines[0].split(' ').last
-      sidekiq = pid_lines[1].split(' ').last
+  def kill_server(stdout_text)
+    pid_lines = stdout_text.scan(/started with pid \d+/)
 
-      system "kill -9 #{puma} && kill -9 #{sidekiq}"
-    end
-end
+    puma    = pid_lines[0].split(' ').last
+    sidekiq = pid_lines[1].split(' ').last
+
+    system "kill -9 #{puma} && kill -9 #{sidekiq}"
+  end
+end

data/test/test_helper.rb

@@ -1,20 +1,20 @@
 require 'minitest/autorun'
 require 'securerandom'
-require_relative '../lib/orats/server'
+require_relative '../lib/orats/commands/new/server'
 
 module Orats
   module Test
-    include Server
+    include Commands::New::Server
 
-    BINARY_PATH = File.absolute_path('../../bin/orats',__FILE__)
-    TEST_PATH = '/tmp/orats/test'
+    BINARY_PATH = File.absolute_path('../../bin/orats', __FILE__)
+    TEST_PATH   = '/tmp/orats/test'
     ORATS_FLAGS = '--pg-password pleasedonthackme --skip-server-start'
 
     def orats(command, options = {})
-      cmd, app_name = command.split(' ')
+      cmd, app_name   = command.split(' ')
       prepend_command = ''
 
-      command = "#{cmd} #{TEST_PATH}/#{app_name}" if command.include?(' ')
+      command         = "#{cmd} #{TEST_PATH}/#{app_name}" if command.include?(' ')
 
       if options.has_key?(:answer)
         options[:answer] == 'y' || options[:answer] == 'yes' ? insert_answer = 'yes' : insert_answer = 'echo'
@@ -27,8 +27,8 @@ module Orats
 
     private
 
-      def generate_app_name
-        "a_#{SecureRandom.hex(8)}"
-      end
+    def generate_app_name
+      "a_#{SecureRandom.hex(8)}"
+    end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orats
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - Nick Janetakis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-11 00:00:00.000000000 Z
+date: 2014-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor