shuttle 1.2.9 → 2.0.0

data/.gitignore

@@ -1,17 +1,3 @@
 *.gem
-*.rbc
-.bundle
-.config
-.yardoc
 Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
 tmp

data/LICENSE

@@ -19,4 +19,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. 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.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,12 +1,12 @@
 # Shuttle
 
-A simplest continuous integration for a Rails application. Enjoy it!
+A simple continuous integration for a Rails application. Enjoy it!
 
-Get a new code from another team members, install new gems, run new migrations, run specs, send your new feature to the origin repository and deploy your application. At the simplest way!
+Get a new code from another team members, install new gems, run new migrations, run specs, send your new feature to the origin repository and deploy your application. At simplest way!
 
 ## Installation
 
-Add this line to your application's Gemfile:
+Add this line into your application's Gemfile:
 
     gem 'shuttle'
 
@@ -20,31 +20,27 @@ And then configure default Shuttle Steps:
 
     $ rails g shuttle:install
     
-This will create a configuration file in `config/initializers/shuttle.rb` looks like this:
-
-    Shuttle.setup do |s|
-      s.steps = [
-        'shuttle:git:check',
-        'shuttle:git:pull',
-        'shuttle:bundle',
-        'db:migrate',
-        'shuttle:spec',
-        'shuttle:git:push',
-        # 'log:clear',
-        # 'tmp:clear',
-      ]
-    
-      # s.stages = {
-      #   staging:    'your@server.com:staging-repository.git',
-      #   production: 'your@server.com:production-repository.git'
-      # }
-    end
+This will create a configuration file in `config/shuttle.yml` who looks like this:
+
+    steps:
+      - shuttle:git:check
+      - shuttle:git:pull
+      - shuttle:bundle
+      - db:migrate
+      - shuttle:spec
+      - shuttle:git:push
+      # - log:clear
+      # - tmp:clear
+
+    # stages:
+    #   staging:    your@server.com:staging-repository.git
+    #   production: your@server.com:production-repository.git
 
 ### Understanding
 
 #### Shuttle Steps
 
-The steps are nothing more than Rake tasks that are performed at the time of integration. The order of the steps in the array will be the order they will be executed. You have the freedom to rearrange, add or delete steps according to your need.
+The steps are nothing more than Rake tasks, performed at the integration time. The array steps order will be the execution order. You have the freedom to rearrange, add or delete steps according to your need.
 
 ##### Shuttle's pre-defined Steps:
 

data/lib/generators/shuttle/install_generator.rb

@@ -4,7 +4,7 @@ module Shuttle
       source_root File.expand_path('../templates', __FILE__)
 
       def copy_install_file
-        template 'shuttle.rb', 'config/initializers/shuttle.rb'
+        template 'shuttle.yml', 'config/shuttle.yml'
       end
     end
   end

data/lib/generators/shuttle/templates/shuttle.yml

@@ -0,0 +1,13 @@
+steps:
+  - shuttle:git:check
+  - shuttle:git:pull
+  - shuttle:bundle
+  - db:migrate
+  - shuttle:spec
+  - shuttle:git:push
+  # - log:clear
+  # - tmp:clear
+
+# stages:
+#   staging:    your@server.com:staging-repository.git
+#   production: your@server.com:production-repository.git

data/lib/shuttle.rb

@@ -1,9 +1,19 @@
-require "shuttle/railtie"
+require 'shuttle/railtie'
 
 module Shuttle
-  mattr_accessor :steps, :stages
+  def self.yaml
+    begin
+      YAML.load_file(Rails.root.join('config/shuttle.yml').to_s)
+    rescue Errno::ENOENT
+      nil
+    end
+  end
+
+  def self.steps
+    yaml['steps'] if yaml.present?
+  end
 
-  def self.setup
-    yield self
+  def self.stages
+    yaml['stages'] if yaml.present?
   end
 end

data/lib/shuttle/railtie.rb

@@ -1,7 +1,7 @@
 module Shuttle
   class Railtie < Rails::Railtie
     rake_tasks do
-      Dir[File.join(File.dirname(__FILE__), '../tasks/*.rake')].each { |file| load file }
+      Dir[File.expand_path('../../tasks/*.rake', __FILE__)].each { |f| load f }
     end
   end
 end

data/lib/shuttle/version.rb

@@ -1,3 +1,3 @@
 module Shuttle
-  VERSION = "1.2.9"
+  VERSION = '2.0.0'
 end

data/lib/tasks/shuttle.rake

@@ -15,11 +15,11 @@ namespace :shuttle do
     end
 
     task :pull do
-      sh "git pull --rebase"
+      sh 'git pull --rebase'
     end
 
     task :push do
-      sh "git push"
+      sh 'git push'
     end
   end
 
@@ -36,8 +36,8 @@ desc 'Launch the code to space!'
 task :shuttle, [:stages] => :environment do |t, args|
   if Shuttle.steps.blank?
     puts %{
-  You should define Shuttle Steps in 'config/initializers/shuttle.rb'.
-  Or run 'rails g shuttle:install' to create this file with default steps.
+  You should define Shuttle Steps and Stages in 'config/shuttle.yml'.
+  Or run 'rails g shuttle:install' to create this file with default steps and stages.
     }.yellow
 
     exit
@@ -57,7 +57,7 @@ task :shuttle, [:stages] => :environment do |t, args|
 
   if args[:stages].present?
     args[:stages].split(':').each do |stage|
-      if repository = Shuttle.stages.try(:[], stage.try(:to_sym))
+      if repository = Shuttle.stages.try(:[], stage)
         p80("Executing deploy to #{stage}...") do
           sh "git push #{repository} HEAD:master -f"
         end

data/shuttle.gemspec

@@ -1,15 +1,15 @@
 require File.expand_path('../lib/shuttle/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["Felipe Bazzarella"]
-  gem.email         = ["fbazzarella@gmail.com"]
-  gem.description   = %q{A simplest continuous integration for a Rails application. Enjoy it!}
-  gem.summary       = %q{Get a new code from another team members, install new gems, run new migrations, run specs, send your new feature to the origin repository and deploy your application. At the simplest way!}
+  gem.authors       = ['Felipe Bazzarella']
+  gem.email         = ['fbazzarella@gmail.com']
+  gem.description   = %q{A simple continuous integration for a Rails application. Enjoy it!}
+  gem.summary       = %q{Get a new code from another team members, install new gems, run new migrations, run specs, send your new feature to the origin repository and deploy your application. At simplest way!}
 
   gem.files         = `git ls-files`.split($\)
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.name          = "shuttle"
-  gem.require_paths = ["lib"]
+  gem.name          = 'shuttle'
+  gem.require_paths = ['lib']
   gem.version       = Shuttle::VERSION
 
   gem.add_runtime_dependency('colored', '~> 1.2')

metadata

@@ -1,33 +1,33 @@
 --- !ruby/object:Gem::Specification
 name: shuttle
 version: !ruby/object:Gem::Version
-  version: 1.2.9
   prerelease: 
+  version: 2.0.0
 platform: ruby
 authors:
 - Felipe Bazzarella
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-05 00:00:00.000000000 Z
+date: 2013-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  prerelease: false
+  type: :runtime
   name: colored
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
-description: A simplest continuous integration for a Rails application. Enjoy it!
+description: A simple continuous integration for a Rails application. Enjoy it!
 email:
 - fbazzarella@gmail.com
 executables: []
@@ -40,7 +40,7 @@ files:
 - README.md
 - Rakefile
 - lib/generators/shuttle/install_generator.rb
-- lib/generators/shuttle/templates/shuttle.rb
+- lib/generators/shuttle/templates/shuttle.yml
 - lib/shuttle.rb
 - lib/shuttle/railtie.rb
 - lib/shuttle/version.rb
@@ -71,5 +71,5 @@ signing_key:
 specification_version: 3
 summary: Get a new code from another team members, install new gems, run new migrations,
   run specs, send your new feature to the origin repository and deploy your application.
-  At the simplest way!
+  At simplest way!
 test_files: []

data/lib/generators/shuttle/templates/shuttle.rb

@@ -1,17 +0,0 @@
-Shuttle.setup do |s|
-  s.steps = [
-    'shuttle:git:check',
-    'shuttle:git:pull',
-    'shuttle:bundle',
-    'db:migrate',
-    'shuttle:spec',
-    'shuttle:git:push',
-    # 'log:clear',
-    # 'tmp:clear',
-  ]
-
-  # s.stages = {
-  #   staging:    'your@server.com:staging-repository.git',
-  #   production: 'your@server.com:production-repository.git'
-  # }
-end