rda 0.0.6 → 0.1.0

data/Gemfile

@@ -15,17 +15,3 @@ gem 'jquery-rails'
 
 # To use debugger
 # gem 'ruby-debug19', :require => 'ruby-debug'
-
-group :test do
-  gem 'pry'
-  gem 'rspec'
-  gem 'guard'
-  gem 'guard-bundler'
-  gem 'guard-rspec'
-  gem 'fivemat'
-  if RUBY_PLATFORM =~ /darwin/
-    gem 'ruby_gntp'
-  elsif RUBY_PLATFORM =~ /linux/
-    gem 'libnotify'
-  end
-end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rda (0.0.6)
+    rda (0.1.0)
       confstruct
       rails (>= 3.1)
       thor
@@ -59,8 +59,6 @@ GEM
       railties (>= 3.2.0, < 5.0)
       thor (~> 0.14)
     json (1.7.3)
-    libnotify (0.7.4)
-      ffi (~> 1.0.11)
     listen (0.4.7)
       rb-fchange (~> 0.0.5)
       rb-fsevent (~> 0.9.1)
@@ -115,6 +113,7 @@ GEM
     rspec-expectations (2.10.0)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.10.1)
+    ruby_gntp (0.3.4)
     slop (2.4.4)
     sprockets (2.1.3)
       hike (~> 1.2)
@@ -131,12 +130,12 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  fivemat
-  guard
-  guard-bundler
-  guard-rspec
+  fivemat (~> 1.0)
+  guard (~> 1.2)
+  guard-bundler (~> 1.0)
+  guard-rspec (~> 1.1)
   jquery-rails
-  libnotify
-  pry
+  pry (~> 0.9.9)
   rda!
-  rspec
+  rspec (~> 2.10)
+  ruby_gntp (~> 0.3)

data/README.md

@@ -2,13 +2,13 @@
 
 ### Description
 
-Rda(Rails Development Assist) is combined with lots of useful rake tasks which can help you to setup your development enviroments and tools more quickly.
+Rda(Rails Development Assist) is combined with lots of useful rake tasks which can help you to setup your development enviroments and tools more quickly. It is also provide a CLI to set up the enviroments.
 
 ### Features
 
-* Setup RVM for your rails application
+* Set up RVM for your rails application
 * Deploy your rails application to Nginx (rails_env is set to development by default)
-* Release your rails application
+* Release your rails application (not yet)
 
 ### Usage
 
@@ -37,9 +37,12 @@ if Rails.env == 'development'
 end
 ```
 
-#### Setup RVM
+#### Set up RVM
 
 ```bash
+rda rvm setup
+
+# Or
 rake rda:rvm:setup
 ```
 
@@ -53,7 +56,7 @@ else
 fi
 ```
 
-After RVM setup, you need to trust the rvmrc by:
+After setting up RVM, you need to trust the rvmrc by:
 
 ```bash
 rvm rvmrc trust
@@ -61,11 +64,14 @@ rvm rvmrc trust
 
 Or you can set `rvm_trust_rvmrcs_flag=1` in ~/.rvmrc or /etc/rvmrc.
 
-If RVM is not installed this task will do nothing but exit.
+If RVM is not installed, this task will do nothing but exit.
 
 #### Discard RVM settings
 
 ```bash
+rda rvm:discard
+
+# Or
 rake rda:rvm:discard
 ```
 
@@ -74,10 +80,13 @@ This task removes the .rvmrc from your rails application.
 #### Setup Nginx
 
 ```bash
+rda nginx setup
+
+# Or
 rake rda:nginx:setup
 ```
 
-First this task will try to find the config files of Nginx which you have installed from the following paths:
+First this task will try to find the config files of Nginx, which you have installed, from the following paths:
 
 * /etc/nginx
 * /usr/local/nginx/conf
@@ -92,6 +101,9 @@ Rda.configure { nginx_conf_paths ['/path/to/nginx/conf'] }
 Please make sure that you have the write permission of the directory you choosed, or you can run:
 
 ```bash
+rvmsudo rda nginx setup
+
+# Or
 rvmsudo rake rda:nginx:setup
 ```
 
@@ -108,10 +120,16 @@ Finally, You need to start Nginx `/path/to/nginx/sbin/nginx` and then visit http
 #### Discard Nginx settings
 
 ```bash
+rda nginx discard # Or
+
 rake rda:nginx:discard # Or
 
+sudo rda nginx discard # Or
+
 sudo rake rda:nginx:discard # Or
 
+rvmsudo rda nginx discard # Using RVM
+
 rvmsudo rake rda:nginx:discard # Using RVM
 ```
 
@@ -120,14 +138,20 @@ This task will clean up all the things created or configured by rda:nginx:setup.
 #### Restart application
 
 ```bash
+rda app restart
+
+# Or
 rake rda:app:restart
 ```
 
-This task touches tmp/restart.txt to restart your rails application, For detail, please visit "http://bit.ly/ztKA07":http://bit.ly/ztKA07
+This task touches tmp/restart.txt to restart your rails application, For detail, please visit [http://bit.ly/ztKA07](http://bit.ly/ztKA07)
 
 #### Release your rails application(not yet)
 
 ```bash
+rda app release
+
+# Or
 rake rda:app:release
 ```
 

data/bin/rda

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# -*- mode: ruby -*-
+
+require 'rda'
+
+begin
+  require File.expand_path("#{Dir.pwd}/config/application", __FILE__)
+rescue LoadError
+  $stderr.puts "ERROR: You should run rda under rails applications"
+end
+
+class RdaCommand < Thor
+  desc 'rvm ACTION', 'Set up RVM. Available actions: setup, discard.'
+  def rvm(action)
+    Rda::Rvm.new.send(action.to_sym)
+  end
+
+  desc 'nginx ACTION', 'Manage settings of nginx. Available actions: setup, discard.'
+  def nginx(action)
+    Rda::Nginx.new.send(action.to_sym)
+  end
+
+  desc 'app ACTION', 'Manage the lifecycle of the application. Available actions: restart.'
+  def app(action)
+    Rda::App.new.send(action.to_sym)
+  end
+end
+
+RdaCommand.start

data/lib/rda/nginx.rb

@@ -2,13 +2,11 @@ module Rda
   class Nginx < Thor
     include Thor::Actions
 
-    DEFAULT_CONF_PATHS = ['/etc/nginx', '/usr/local/nginx/conf', '/opt/nginx/conf']
-
     def self.source_root
       File.dirname(__FILE__)
     end
 
-    desc "Setup", "Deploy rails application to Nginx"
+    desc "setup", "Set up your rails application"
     def setup
       return unless installed?
 
@@ -25,7 +23,7 @@ module Rda
       end
     end
 
-    desc "Discard", "Remove the Nginx setting of rails application"
+    desc "discard", "Remove the settings of your rails application from nginx"
     def discard
       return unless installed?
 
@@ -68,7 +66,6 @@ module Rda
 
     def available_paths
       search_paths = Rda.config.nginx_conf_paths || []
-      search_paths = DEFAULT_CONF_PATHS if search_paths.empty?
       @paths ||= search_paths.select { |p| Dir.exists? p if p } unless search_paths.empty?
     end
 

data/lib/rda/version.rb

@@ -1,3 +1,3 @@
 module Rda
-  VERSION = "0.0.6"
+  VERSION = "0.1.0"
 end

data/lib/rda.rb

@@ -1,6 +1,7 @@
 require 'rails'
 require 'thor'
 require 'confstruct'
+require 'confstruct/configuration'
 
 require 'rda/railtie'
 require 'rda/rails'

data/lib/tasks/rda_tasks.rake

@@ -2,12 +2,12 @@ namespace :rda do
   namespace :rvm do
     rvm = Rda::Rvm.new
 
-    desc "Setup RVM for rails application"
+    desc "Set up RVM for your rails application"
     task :setup do
       rvm.setup
     end
 
-    desc "Discard RVM settings of rails application"
+    desc "Discard RVM settings of your rails application"
     task :discard do
       rvm.discard
     end
@@ -16,12 +16,12 @@ namespace :rda do
   namespace :nginx do
     nginx = Rda::Nginx.new
 
-    desc "Setup Nginx for rails application"
+    desc "Set up Nginx for your rails application"
     task :setup => :environment do
       nginx.setup
     end
 
-    desc "Discard Nginx settings of rails application"
+    desc "Discard Nginx settings of your rails application"
     task :discard => :environment do
       nginx.discard
     end
@@ -30,7 +30,7 @@ namespace :rda do
   namespace :app do
     app = Rda::App.new
 
-    desc "Restart rails application"
+    desc "Restart your rails application"
     task :restart do
       app.restart
     end

data/rda.gemspec

@@ -13,9 +13,20 @@ Gem::Specification.new do |s|
   s.summary     = 'Rails Development Assist'
   s.description = 'Rda(Rails Development Assist) is combined with lots of useful rake tasks which can help you to setup your development enviroments and tools more quickly.'
 
+  s.executables = `git ls-files -- bin/*`.split("\n").map{|f| File.basename(f)}
   s.files       = `git ls-files`.split("\n")
   s.test_files  = `git ls-files -- {spec,features}/*`.split("\n")
-  s.require_paths = ['lib']  
+  s.require_paths = ['lib']
+
+  s.add_development_dependency 'pry', '~> 0.9.9'
+  s.add_development_dependency 'rspec', '~> 2.10'
+  s.add_development_dependency 'guard', '~> 1.2'
+  s.add_development_dependency 'guard-bundler', '~> 1.0'
+  s.add_development_dependency 'guard-rspec', '~> 1.1'
+  s.add_development_dependency 'fivemat', '~> 1.0'
+  if RUBY_PLATFORM =~ /darwin/
+    s.add_development_dependency 'ruby_gntp', '~> 0.3'
+  end
 
   s.add_dependency 'rails', '>= 3.1'
   s.add_dependency 'thor'

data/spec/lib/rda/nginx_spec.rb

@@ -4,7 +4,7 @@ describe Rda::Nginx do
   subject { Rda::Nginx.new }
 
   before do
-    Rda.configure { nginx_conf_paths Rda::Nginx::DEFAULT_CONF_PATHS }
+    Rda.configure { nginx_conf_paths ['/etc/nginx', '/usr/local/nginx/conf', '/opt/nginx/conf'] }
   end
 
   describe '#setup' do
@@ -66,7 +66,7 @@ Found more than one config directory of Nginx, please choose one to setup:
       conf = Rda.config.nginx_conf_paths.first
       FileUtils.rm_r conf if Dir.exists?(conf)
 
-      Rda.configure { nginx_conf_paths [Rda::Nginx::DEFAULT_CONF_PATHS] }
+      Rda.configure { nginx_conf_paths ['/etc/nginx', '/usr/local/nginx/conf', '/opt/nginx/conf'] }
     end
 
     it 'discards the settings' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rda
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,120 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-02 00:00:00.000000000 Z
+date: 2012-09-19 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.9
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.9
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.10'
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: guard-bundler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: fivemat
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: ruby_gntp
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -63,7 +175,8 @@ description: Rda(Rails Development Assist) is combined with lots of useful rake
   which can help you to setup your development enviroments and tools more quickly.
 email:
 - towerhe@gmail.com
-executables: []
+executables:
+- rda
 extensions: []
 extra_rdoc_files: []
 files:
@@ -76,6 +189,7 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- bin/rda
 - lib/rda.rb
 - lib/rda/app.rb
 - lib/rda/nginx.rb
@@ -141,7 +255,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 93405623145392106
+      hash: 1257555642380015887
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -150,11 +264,49 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 93405623145392106
+      hash: 1257555642380015887
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Rails Development Assist
-test_files: []
+test_files:
+- spec/dummy/Rakefile
+- spec/dummy/app/assets/javascripts/application.js
+- spec/dummy/app/assets/stylesheets/application.css
+- spec/dummy/app/controllers/application_controller.rb
+- spec/dummy/app/helpers/application_helper.rb
+- spec/dummy/app/mailers/.gitkeep
+- spec/dummy/app/models/.gitkeep
+- spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/config.ru
+- spec/dummy/config/application.rb
+- spec/dummy/config/boot.rb
+- spec/dummy/config/environment.rb
+- spec/dummy/config/environments/development.rb
+- spec/dummy/config/environments/production.rb
+- spec/dummy/config/environments/test.rb
+- spec/dummy/config/initializers/backtrace_silencers.rb
+- spec/dummy/config/initializers/inflections.rb
+- spec/dummy/config/initializers/mime_types.rb
+- spec/dummy/config/initializers/rda.rb
+- spec/dummy/config/initializers/secret_token.rb
+- spec/dummy/config/initializers/session_store.rb
+- spec/dummy/config/initializers/wrap_parameters.rb
+- spec/dummy/config/locales/en.yml
+- spec/dummy/config/routes.rb
+- spec/dummy/lib/assets/.gitkeep
+- spec/dummy/log/.gitkeep
+- spec/dummy/public/404.html
+- spec/dummy/public/422.html
+- spec/dummy/public/500.html
+- spec/dummy/public/favicon.ico
+- spec/dummy/script/rails
+- spec/fixtures/nginx.conf
+- spec/lib/rda/app_spec.rb
+- spec/lib/rda/nginx_spec.rb
+- spec/lib/rda/rails_spec.rb
+- spec/lib/rda/rvm_spec.rb
+- spec/lib/rda_spec.rb
+- spec/spec_helper.rb