soyuz 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 616e95ef8698ce943bed2b8ea5c090654e625f5f
-  data.tar.gz: 9236257f9c10d961fa5fea4eee69049958b4bfec
+  metadata.gz: dd3caff53d1ac3465a10f1d59e22d45b951bd303
+  data.tar.gz: 4e9e9253a004283522f0d50db48df1c1186ac59b
 SHA512:
-  metadata.gz: b5d7efa525dcd88fdbe0d2d25d79f48660d5ef530011f07045c8a8f39c11a7800ae6f605332bdc9f339311ae9caeb7dfc8142b3cffa97f773589b6e875e75df7
-  data.tar.gz: eb661d95bc03183e48836092c902e92b0b06933788c352db0ddb60db74cc3c4d5523d3efe894f78b4dfba42cc460132ccc63b13e31e2338166c0f9ea19786f0a
+  metadata.gz: d708cc3cccb3e5123f9a5c374980974ec6f42821c2af006bf6a9681ea2010f3e9893c73e1e30c5d22e09b937f2451a8b3bc269ebe618db5348603193c9f4a16d
+  data.tar.gz: c6981603c6e7e5afb331bf86ef3d765d993066c32e60cb9d456a66096713d69ba5635e60d6f8ffe873740a3ca421b470711cfcfa4f9e969d260fa038baf7c0a2

data/.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 rvm:
   - 2.0
-  - 2.1
+  - 2.1.1
+  - 2.1.2
   - 1.9.3
-  - jruby-19mode # JRuby in 1.9 mode
 script: bundle exec rspec

data/README.md

@@ -20,7 +20,7 @@ Or install it yourself as:
 
 ```yaml
 # .soyuz.yml in the app you want to deploy with soyuz
-default:
+defaults:
   deploy_cmd: 'opsicle deploy $SOYUZ_ENVIRONMENT'
   
     

data/bin/soyuz

@@ -1,29 +1,38 @@
 #!/usr/bin/env ruby
 require 'rubygems'
-require 'commander/import'
+require 'gli'
 require 'soyuz'
 
-# :name is optional, otherwise uses the basename of this executable
-program :name, 'soyuz'
-program :version, Soyuz::VERSION
-program :description, 'The trusty old deployment tool-kit'
-default_command :help
-global_option('-c', '--config FILE', 'soyuz config file')
-
-command :check do |c|
-  c.syntax = "soyuz check [options]"
-  c.description = "Check your config file to ensure it's valid"
-  c.action do |args, options|
-    options.default config: ".soyuz.yml"
-    Soyuz::Config.new(options.config).check
+include GLI::App
+
+program_desc 'The trusty old deployment tool-kit'
+version Soyuz::VERSION
+
+wrap_help_text :verbatim
+
+program_long_desc """
+DOCUMENTATION
+    For documentation and help in setting up your configuration files,
+    see Soyuz's GitHub repo: https://github.com/sportngin/soyuz
+"""
+
+
+desc "Check your config file to ensure it's valid"
+command 'check' do |c|
+  c.flag [:c, :config], :desc => 'soyuz config file', :default_value => '.soyuz.yml'
+  c.action do |global_options, options, args|
+    options = global_options.merge(options)
+    Soyuz::Config.new(options[:config]).check
   end
 end
 
-command :deploy do |c|
-  c.syntax = "soyuz deploy [options]"
-  c.description = "Deploy your application"
-  c.action do |args, options|
-    options.default config: ".soyuz.yml"
-    Soyuz::Deploy.new(options.config).execute
+desc "Deploy your application"
+command 'deploy' do |c|
+  c.flag [:c, :config], :desc => 'soyuz config file', :default_value => '.soyuz.yml'
+  c.action do |global_options, options, args|
+    options = global_options.merge(options)
+    Soyuz::Deploy.new(options[:config]).execute
   end
 end
+
+exit run(ARGV)

data/lib/soyuz/command.rb

@@ -1,4 +1,6 @@
+require 'highline/import'
 require_relative 'command_choice'
+
 module Soyuz
   class Command
     def initialize(cmd)
@@ -11,6 +13,7 @@ module Soyuz
     end
 
     def run
+      say("<%= color('executing [#{@cmd}]...', :green) %>")
       system(@cmd)
     end
   end

data/lib/soyuz/version.rb

@@ -1,3 +1,3 @@
 module Soyuz
-  VERSION = "0.0.1"
+  VERSION = "0.0.3"
 end

data/soyuz.gemspec

@@ -18,8 +18,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "commander"
+  spec.add_dependency "gli"
+  spec.add_dependency "highline"
   spec.add_dependency "safe_yaml"
+  spec.add_dependency "psych", ">=2.0.5"
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"

data/spec/soyuz/command_spec.rb

@@ -5,6 +5,10 @@ module Soyuz
     let(:cmd){ "echo derp" }
     subject { Command.new(cmd) }
 
+    before do
+      allow(subject).to receive(:puts)
+    end
+
     context "cmd isn't a string" do
       let(:cmd) { 1234 }
       subject { Command }

data/spec/soyuz/config_spec.rb

@@ -5,6 +5,10 @@ module Soyuz
     let(:valid_config){ "files/soyuz_example.yml" }
     subject { Config.new(valid_config) }
 
+    before do
+      allow(subject).to receive(:puts)
+    end
+
     context "#check" do
       it "to raise an InvalidConfig error if the config is invalid" do
         allow(subject).to receive(:valid?) { false }

metadata

@@ -1,17 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: soyuz
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Andy Fleener
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-09 00:00:00.000000000 Z
+date: 2014-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: commander
+  name: gli
+  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: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -38,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: psych
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.5
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement