foreplay 0.0.1 → 0.0.2

data/spec/lib/foreplay/setup_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+require 'foreplay'
+
+describe Foreplay::Setup do
+  before :each do
+    `rm -f config/foreplay.yml`
+  end
+
+  it "should create a config file" do
+    File.should_receive(:open)
+    Foreplay::Setup.start
+  end
+end

data/spec/lib/foreplay/utility_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+require 'foreplay'
+
+describe Foreplay::Utility do
+  it "should complain unless two hashes are passed to it" do
+    expect { Foreplay::Utility::supermerge('x', 'y') }.to raise_error(RuntimeError)
+  end
+
+  it "should merge two simple hashes" do
+    expect(Foreplay::Utility::supermerge({ :a => 'x' }, { :b => 'y' })).to eq({ 'a' => 'x', 'b' => 'y' })
+  end
+
+  it "should merge two hashes both with arrays at the same key" do
+    expect(Foreplay::Utility::supermerge({ :a => ['x'] }, { :a => ['y'] })).to eq({ 'a' => ['x', 'y'] })
+  end
+
+  it "should merge an array and a value at the same key" do
+    expect(Foreplay::Utility::supermerge({ :a => 'x' }, { :a => ['y'] })).to eq({ 'a' => ['x', 'y'] })
+  end
+
+  it "should replace a value at the same key" do
+    expect(Foreplay::Utility::supermerge({ :a => 'x' }, { :a => 'y' })).to eq({ 'a' => 'y' })
+  end
+
+  it "should merge two subhashes at the same key" do
+    expect(Foreplay::Utility::supermerge({ :a => { :b => 'x' } }, { :a => { :c => 'y' } })).to eq({ 'a' => { 'b' => 'x', 'c' => 'y' } })
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,16 @@
+# Initialize simplecov for coverage report.
+require 'simplecov'
+SimpleCov.start
+
+RSpec.configure do |config|
+ # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = "random"
+
+  # Manually-added
+  config.color_enabled = true
+  config.tty = true
+  config.formatter = :documentation
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreplay
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-09 00:00:00.000000000 Z
+date: 2013-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -43,22 +43,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: hashie
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: foreman
   requirement: !ruby/object:Gem::Requirement
@@ -203,6 +187,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Deploying Rails projects to Ubuntu using Foreman
 email:
 - developers@xenapto.com
@@ -212,24 +212,30 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rvmrc
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/foreplay
-- features/config.feature
-- features/generator.feature
-- features/support/setup.rb
+- features/check.feature
+- features/deploy.feature
+- features/setup.feature
+- features/support/env.rb
 - foreplay.gemspec
 - foreplay.rake
 - foreplay.rb
 - lib/foreplay.rb
 - lib/foreplay/cli.rb
-- lib/foreplay/config.rb
-- lib/foreplay/generators/foreplay.yml
-- lib/foreplay/generators/setup.rb
+- lib/foreplay/deploy.rb
+- lib/foreplay/setup.rb
+- lib/foreplay/setup/foreplay.yml
+- lib/foreplay/utility.rb
 - lib/foreplay/version.rb
-- spec/foreplay_spec.rb
+- spec/lib/foreplay/deploy_spec.rb
+- spec/lib/foreplay/setup_spec.rb
+- spec/lib/foreplay/utility_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/Xenapto/foreplay
 licenses:
 - MIT
@@ -245,7 +251,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -929256133810576486
+      hash: -981112274767649738
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -254,7 +260,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -929256133810576486
+      hash: -981112274767649738
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -262,7 +268,11 @@ signing_key:
 specification_version: 3
 summary: ! 'Example: foreplay push to production'
 test_files:
-- features/config.feature
-- features/generator.feature
-- features/support/setup.rb
-- spec/foreplay_spec.rb
+- features/check.feature
+- features/deploy.feature
+- features/setup.feature
+- features/support/env.rb
+- spec/lib/foreplay/deploy_spec.rb
+- spec/lib/foreplay/setup_spec.rb
+- spec/lib/foreplay/utility_spec.rb
+- spec/spec_helper.rb

data/features/config.feature

@@ -1,66 +0,0 @@
-Feature: Config
-  In order to configure Foreplay
-  As a CLI
-  I want to be as usable as possible
-
-  Scenario: Check configuration
-    When I run `foreplay check`
-    Then the output should contain "OK"
-
-  Scenario: Check configuration parameters - invalid parameter
-    When I run `foreplay check --invalid xyz`
-    Then the output should contain:
-    	"""
-    	ERROR: foreplay check was called with arguments ["--invalid", "xyz"]
-		Usage: "foreplay check".
-    	"""
-
-  Scenario: Check configuration parameters - short invalid parameter
-    When I run `foreplay check -x xyz`
-    Then the output should contain:
-    	"""
-		ERROR: foreplay check was called with arguments ["-x", "xyz"]
-		Usage: "foreplay check".
-    	"""
-
-  Scenario: Check configuration parameters - environment parameter
-    When I run `foreplay check --environment production`
-    Then the output should contain "Checking configuration for"
-    And the output should contain "production environment"
-    And the output should contain "all roles"
-    And the output should contain "all servers"
-
-  Scenario: Check configuration parameters - role parameter
-    When I run `foreplay check --role worker`
-    Then the output should contain "Checking configuration for"
-    And the output should contain "all environments"
-    And the output should contain "worker role"
-    And the output should contain "all servers"
-
-  Scenario: Check configuration parameters - server parameter
-    When I run `foreplay check --server worker.example.com`
-    Then the output should contain "Checking configuration for"
-    And the output should contain "all environments"
-    And the output should contain "all roles"
-    And the output should contain "worker.example.com server"
-
-  Scenario: Check configuration parameters - short environment parameter
-    When I run `foreplay check -e production`
-    Then the output should contain "Checking configuration for"
-    And the output should contain "production environment"
-    And the output should contain "all roles"
-    And the output should contain "all servers"
-
-  Scenario: Check configuration parameters - short role parameter
-    When I run `foreplay check -r worker`
-    Then the output should contain "Checking configuration for"
-    And the output should contain "all environments"
-    And the output should contain "worker role"
-    And the output should contain "all servers"
-
-  Scenario: Check configuration parameters - short server parameter
-    When I run `foreplay check -s worker.example.com`
-    Then the output should contain "Checking configuration for"
-    And the output should contain "all environments"
-    And the output should contain "all roles"
-    And the output should contain "worker.example.com server"

data/features/generator.feature

@@ -1,97 +0,0 @@
-Feature: Setup
-  In order to setup Foreplay
-  As a CLI user
-  I want to be able to create the config scaffold
-
-  Scenario: Setup
-	When I run `foreplay setup`
-	Then the following files should exist:
-		| config/foreplay.yml |
-	And the file "config/foreplay.yml" should contain:
-		"""
-		# Format:
-		#
-		# There is a section for each environment that you will deploy to, plus a section that defines global default
-		# values for all environments, like this:
-		#
-		# defaults:
-		#   ...
-		# production:
-		#   ...
-		# staging:
-		#   ...
-		#
-		# Within each section you can define the server roles for that environment: web, worker, database etc. (the
-		# names of these roles are up to you). You can also define environment-level defaults that apply to all roles.
-		# Like this:
-		#
-		# production:
-		#   defaults:
-		#     ...
-		#   web:
-		#     ...
-		#   worker:
-		#     ...
-		#   scheduler:
-		#     ...
-		#   database:
-		#     ...
-		# staging:
-		#   defaults:
-		#     ...
-		#   web:
-		#     ...
-		#   worker:
-		#     ...
-		#   scheduler:
-		#     ...
-		#   database:
-		#     ...
-		#
-		# Within each role section you can define how the deployment is configured for the servers in that role.
-		# Some of these values will normally be defined as a default, some will be specific to a particular role.
-		# The values you can configure are as follows:
-		#
-		# value         Normally defined as  Notes
-		# ------------- -------------------- -------------------------------------------------------------------
-		# name:         Global default       App name (if omitted then
-		#                                    Rails.application.class.parent_name.underscore is used)
-		# user:         Global default       The username to connect with (must have SSH permissions)
-		# password:     Global default       The password to use to connect (not necessary if you've set up SSH
-		#                                    keys - see below)
-		# keyfile:      Global default       A file containing a private key that allows the named user access
-		#                                    to the server, or...
-		# key:          Global default       A private key that allows the named user access to the server
-		# path:         Global default       An absolute path to deploy the app on each server. %a will be
-		#                                    translated to the application name. %u will be translated to the
-		#                                    login user name
-		# database:     Environment default  The database.yml elements to write to the config folder
-		#   key: value
-		# servers: [server1, server2, server3]
-		#               Role level           Which servers to deploy the app on
-		# env:          Role level           Contents of the .env file
-		#   key: value                       Values will go into the .env file as key=value
-		# foreman:      Role level           Contents of the .foreman file
-		#   key: value
-		#
-		defaults:
-		  name: %q{TODO: Add the app name}
-		  repository: %q{TODO: Add the git repository path}
-		  user: %q{TODO: Add the user to logon to the deployment server}
-		  password: %q{TODO: Add the password for the user on the deployment server}
-		  path: %q{TODO: Add the path to deploy to on the deployment server}
-		production:
-		  defaults:
-		    database:
-		      adapter: postgresql
-		      encoding: utf8
-		      database: %q{TODO: Add the database name}
-		      pool: 5
-		      host: %q{TODO: Add the database host name}
-		      username: %q{TODO: Add the database user}
-		      password: %q{TODO: Add the database user's password}
-		  web:
-		    servers: [%q{TODO: Add the name of the production web server}]
-		    foreman:
-		      concurrency: 'web=1,worker=0,scheduler=0'
-		"""

data/features/support/setup.rb

@@ -1 +0,0 @@
-require 'aruba/cucumber'

data/lib/foreplay/config.rb

@@ -1,25 +0,0 @@
-require 'active_support/inflector'
-require 'colorize'
-require 'hashie/mash'
-
-module Foreplay
-  class Config
-    def self.check *args
-      options = Hashie::Mash[args.first]
-
-      # Explain what we're going to do
-      environments  = explanatory_text options.environment, 'environment'
-      roles         = explanatory_text options.role, 'role'
-      servers       = explanatory_text options.server, 'server'
-      puts 'Checking configuration for %s, %s, %s' % [environments, roles, servers]
-
-      'Not finished'
-    end
-
-    private
-
-    def self.explanatory_text(value, singular_word)
-      value.nil? ? "all #{singular_word.pluralize}" : "#{value.dup.yellow} #{singular_word}"
-    end
-  end
-end

data/lib/foreplay/generators/setup.rb

@@ -1,20 +0,0 @@
-require 'thor/group'
-
-module Foreplay
-  module Generators
-    class Setup < Thor::Group
-      include Thor::Actions
-
-      Rails ||= nil
-
-      def self.source_root
-        File.dirname(__FILE__)
-      end
-
-      def create_config_file
-        @name = Rails.nil? ? '%q{TODO: Add the app name}' : Rails.application.class.parent_name.underscore
-        template('foreplay.yml', 'config/foreplay.yml')
-      end
-    end
-  end
-end

data/spec/foreplay_spec.rb

@@ -1,7 +0,0 @@
-require 'foreplay'
-
-describe Foreplay::Config do
-	it "should check the config" do
-		Foreplay::Config.check.should eql('OK')
-	end
-end