rhoconnect 4.0.4 → 5.1.1

data/generators/rhoconnect.rb

@@ -1,272 +1,152 @@
-require 'rubygems'
-require 'templater'
+require 'thor'
+require 'thor/group'
 
 module Rhoconnect
-  extend Templater::Manifold
-  extend Rhoconnect
 
-  desc <<-DESC
-    Rhoconnect generator
-  DESC
+  class AppGenerator < Thor::Group
+    namespace :app_generator
+    include Thor::Actions
 
-  class BaseGenerator < Templater::Generator
-    def class_name
-      name.gsub('-', '_').camel_case
-    end
-
-    def underscore_name
-      Rhoconnect.under_score(name)
-    end
-
-    def gem_version
-      VERSION
-    end
-
-    # Callback method to run ERB on destination file
-    def run_erb(action)
-      template = ERB.new(File.read(action.destination))
-      File.open(action.destination, "w") { |f| f << template.result(binding) }
-    end
-
-    def self.install_js_option(klass)
-      klass.option :js, :required => false, :default => false, :desc => "generate JavaScript code", :as => :boolean
-    end
-
-    def self.install_app_options(klass)
-      klass.first_argument :name, :required => true, :desc => "application name"
-      install_js_option(klass)
-    end
-
-    def self.install_source_options(klass)
-      klass.first_argument :name, :required => true, :desc => "source name"
-      install_js_option(klass)
-    end
-
-    alias_method :module_name, :class_name
-  end
+    argument :name
+    class_options :js => false
+    source_root File.join(File.dirname(__FILE__), 'templates', 'application')
 
-  class AppGenerator < BaseGenerator
-    install_app_options(self)
+    def gem_version; VERSION; end
 
-    def self.source_root
-      File.join(File.dirname(__FILE__), 'templates', 'application')
-    end
-
-    desc <<-DESC
-      Generates a new rhoconnect application.
-
-      Required:
-        name        - application name
-    DESC
-
-    # 'template' does not work under jruby. Using 'file' and after hook instead
-    file :configru, :after => :run_erb  do |template|
-      require 'securerandom' rescue nil
+    def copy_files
       @secret = SecureRandom.hex(64) rescue '<changeme>'
-      template.source = 'config.ru'
-      template.destination = "#{name}/config.ru"
-    end
+      template("config.ru", "#{name}/config.ru")
+      template("Gemfile", "#{name}/Gemfile")
 
-    template :gitignore do |template|
-      template.source = 'gitignore'
-      template.destination = "#{name}/.gitignore"
-    end
+      copy_file "gitignore", "#{name}/.gitignore"
+      copy_file 'rcgemfile', "#{name}/.rcgemfile"
+      copy_file 'Rakefile', "#{name}/Rakefile"
+      copy_file 'settings/settings.yml', "#{name}/settings/settings.yml"
+      copy_file 'settings/license.key', "#{name}/settings/license.key"
+      empty_directory File.join("#{name}", 'public')
 
-    template :settings do |template|
-      template.source = 'settings/settings.yml'
-      template.destination = "#{name}/settings/settings.yml"
-    end
+      if options[:js]
+        copy_file 'controllers/js/application_controller.js', "#{name}/controllers/js/application_controller.js"
+        # TODO: spec files for js app ...
 
-    template :license do |template|
-      template.source = 'settings/license.key'
-      template.destination = "#{name}/settings/license.key"
-    end
+        npm_install_note = <<_NPM_INSTALL_
 
-    template :rakefile do |template|
-      template.source = 'Rakefile'
-      template.destination = "#{name}/Rakefile"
-    end
-
-    # 'template' does not work under jruby. Using 'file' and after hook instead
-    file :gemfile, :after => :run_erb do |file|
-      file.source = 'Gemfile'
-      file.destination = "#{name}/Gemfile"
-    end
+In the future, to ensure that all the JavaScript dependencies in your
+rhoconnect application are available execute these commands:
+cd #{name} && npm install
 
-    template :gemfile_app do |template|
-      template.source = 'rcgemfile'
-      template.destination = "#{name}/.rcgemfile"
-    end
+_NPM_INSTALL_
 
-    empty_directory :public do |dir|
-      dir.destination = File.join("#{name}", 'public')
+        copy_file 'package.json', "#{name}/package.json"
+        say npm_install_note, :bold
+        Dir.chdir(name) { system("npm install") }
+        # NB: The following does not work with JRuby (1.7.7)
+        # system("npm install", :chdir => name)
+      else # Ruby app ...
+        copy_file 'controllers/ruby/application_controller.rb', "#{name}/controllers/ruby/application_controller.rb"
+        copy_file 'spec/application_controller_spec.rb', "#{name}/spec/controllers/ruby/application_controller_spec.rb"
+        copy_file 'spec/spec_helper.rb', "#{name}/spec/spec_helper.rb"
+      end
     end
 
-    invoke :js_app, :js => true
-    invoke :ruby_app, :js => false
-
     def after_run
       install_gems_note = <<_BUNDLE_INSTALL_
 
 In the future, to ensure that all the dependencies in your rhoconnect application
 are available execute these commands:
-    cd #{name} && bundle install
+cd #{name} && bundle install
 
 If you're setting up the application in a production environment run the following:
-    cd #{name} && bundle install --without=test development
+cd #{name} && bundle install --without=test development
 
 _BUNDLE_INSTALL_
 
       running_bundler_first_time = <<_RUN_BUNDLER
 
 Executing 'bundle install' for the first time in your freshly baked application!
-      bundle install --gemfile=#{destination_root}/#{name}/Gemfile
+bundle install --gemfile=#{destination_root}/#{name}/Gemfile
 
 _RUN_BUNDLER
 
       gem_name, gem_ver_reqs = 'rhoconnect', gem_version
       found_gspec = Gem::Specification.find_by_name(gem_name, gem_ver_reqs)
       if found_gspec
-        puts running_bundler_first_time
+        say running_bundler_first_time, :bold
         system("bundle install --gemfile=#{destination_root}/#{name}/Gemfile")
-        puts install_gems_note
+        say install_gems_note, :bold
       end
-    rescue  Exception => e
-      warning_msg =  "\n" +
-        "*** Warning:  Generatior failed to run bundler.                 ***\n" +
-        "*** Install required version of rhoconnect gem, or explicitly   ***\n" +
+    rescue Exception => e
+      warning_msg = "\n" +
+        "*** Warning: Generatior failed to run bundler. ***\n" +
+        "*** Install required version of rhoconnect gem, or explicitly ***\n" +
         "*** define in Gemfile the source to the gem using :path option. ***\n" +
         "\n"
-      puts warning_msg
+      say warning_msg, :red
     end
   end
 
-  class RubyAppGenerator < AppGenerator
-    install_app_options(self)
+  class BaseSourceGenerator < Thor::Group
+    include Thor::Actions
 
-    template :application do |template|
-      template.source = 'controllers/ruby/application_controller.rb'
-      template.destination = "#{name}/controllers/ruby/application_controller.rb"
-    end
-
-    template :application_spec do |template|
-      template.source = 'spec/application_controller_spec.rb'
-      template.destination = "#{name}/spec/controllers/ruby/application_controller_spec.rb"
-    end
-
-    template :spec_helper do |template|
-      template.source = 'spec/spec_helper.rb'
-      template.destination = "#{name}/spec/spec_helper.rb"
-    end
-  end
-
-  class JsAppGenerator < AppGenerator
-    install_app_options(self)
-
-    file :packagejson, :after => :npm_install do |template|
-      template.source = 'package.json'
-      template.destination = "#{name}/package.json"
-    end
+    argument :name
+    class_options :js => false
 
-    template :application do |template|
-      template.source = 'controllers/js/application_controller.js'
-      template.destination = "#{name}/controllers/js/application_controller.js"
-    end
-
-    def npm_install(action)
-      npm_install_note = <<_NPM_INSTALL_
-
-In the future, to ensure that all the JavaScript dependencies in your
-rhoconnect application are available execute these commands:
-    cd #{name} && npm install
-
-_NPM_INSTALL_
-      puts npm_install_note
-      Dir.chdir(name) { system("npm install") }
+    def class_name
+      Thor::Util.camel_case(name.gsub('-', '_'))
     end
-  end
-
-  class SourceGenerator < BaseGenerator
-    install_source_options(self)
 
-    def self.source_root
-      File.join(File.dirname(__FILE__), 'templates', 'source')
+    def underscore_name
+      Thor::Util.snake_case(name)
     end
-
-    desc <<-DESC
-      Generates a new source adapter (Controller/Model pair).
-
-      Required:
-        name        - source name (i.e. product)
-    DESC
-
-    invoke :ruby_source, :js => false
-    invoke :js_source, :js => true
   end
 
-  class RubySourceGenerator < SourceGenerator
-    install_source_options(self)
-
-    # 'template' does not work under jruby. Using 'file' and after hook instead
-    file :model, :after => :run_erb do |file|
-      file.source = 'models/ruby/model.rb'
-      file.destination = "models/ruby/#{underscore_name}.rb"
-      settings_file = File.join(@destination_root,'settings','settings.yml')
-      settings = YAML.load_file(settings_file)
-      settings[:sources] ||= {}
-      settings[:sources][class_name] = {:poll_interval => 300}
-      File.open(settings_file, 'w' ) do |f|
-        f.write "#Sources" + {:sources => settings[:sources]}.to_yaml[3..-1]
-        envs = {}
-        [:development,:test,:production].each do |env|
-          envs[env] = settings[env]
+  class ModelGenerator < BaseSourceGenerator
+    namespace :model_generator
+    source_root File.join(File.dirname(__FILE__), 'templates', 'source')
+
+    def create_model_and_specs
+      if options[:js]
+        template('models/js/model.js', "models/js/#{underscore_name}.js")
+      else
+        template('models/ruby/model.rb', "models/ruby/#{underscore_name}.rb")
+        template('models/ruby/model_spec.rb', "spec/models/ruby/#{underscore_name}_spec.rb")
+        # Edit settings.yml file
+        settings_file = File.join(destination_root,'settings','settings.yml')
+        settings = YAML.load_file(settings_file)
+        settings[:sources] ||= {}
+        settings[:sources][class_name] = {:poll_interval => 300}
+        File.open(settings_file, 'w' ) do |f|
+          f.write "#Sources" + {:sources => settings[:sources]}.to_yaml[3..-1]
+          envs = {}
+          [:development,:test,:production].each { |env| envs[env] = settings[env] }
+          f.write envs.to_yaml[3..-1]
+          # write all other settings
+          [:development, :test, :production, :sources].each { |key| settings.delete(key) }
+          f.write settings.to_yaml[3..-1] unless settings.empty?
         end
-        f.write envs.to_yaml[3..-1]
-        # write all other settings
-        [:development, :test, :production, :sources].each do |key|
-          settings.delete(key)
-        end
-        f.write settings.to_yaml[3..-1] unless settings.empty?
       end
     end
+  end
 
-    file :controller, :after => :run_erb do |file|
-      file.source = 'controllers/ruby/controller.rb'
-      file.destination = "controllers/ruby/#{underscore_name}_controller.rb"
-    end
-
-    # 'template' does not work under jruby. Using 'file' and after hook instead
-    file :model_spec, :after => :run_erb do |file|
-      file.source = 'models/ruby/model_spec.rb'
-      file.destination = "spec/models/ruby/#{underscore_name}_spec.rb"
-    end
+  class ControllerGenerator < BaseSourceGenerator
+    namespace :controller_generator
+    source_root File.join(File.dirname(__FILE__), 'templates', 'source')
 
-    # 'template' does not work under jruby. Using 'file' and after hook instead
-    file :controller_spec, :after => :run_erb do |file|
-      file.source = 'controllers/ruby/controller_spec.rb'
-      file.destination = "spec/controllers/ruby/#{underscore_name}_controller_spec.rb"
+    def create_controller_and_specs
+      if options[:js]
+        template('controllers/js/controller.js', "controllers/js/#{underscore_name}_controller.js")
+      else
+        template('controllers/ruby/controller.rb', "controllers/ruby/#{underscore_name}_controller.rb")
+        template('controllers/ruby/controller_spec.rb', "spec/controllers/ruby/#{underscore_name}_controller_spec.rb")
+      end
     end
   end
 
-  class JsSourceGenerator < SourceGenerator
-    install_source_options(self)
+  class SourceGenerator < BaseSourceGenerator
+    namespace :source_generator
 
-    file :model, :after => :run_erb do |file|
-      file.source = 'models/js/model.js'
-      file.destination = "models/js/#{underscore_name}.js"
-    end
-
-    file :controller, :after => :run_erb do |file|
-      file.source = 'controllers/js/controller.js'
-      file.destination = "controllers/js/#{underscore_name}_controller.js"
-    end
+    invoke :controller_generator
+    invoke :model_generator
   end
 
-  add :app, AppGenerator
-  add_private :ruby_app, RubyAppGenerator
-  add_private :js_app, JsAppGenerator
-
-  add :source, SourceGenerator
-  add_private :ruby_source, RubySourceGenerator
-  add_private :js_source, JsSourceGenerator
 end

data/generators/templates/application/rcgemfile

@@ -6,7 +6,7 @@ gem 'win32-process', '= 0.6.6', :platforms => [:mswin, :mingw]
 
 # use thin and eventmachine everywhere except JRuby
 platforms :ruby, :mingw do
-  gem "eventmachine", "~> 1.0.0"
+  gem "eventmachine", "~> 1.0.5"
   # using thin by default
   gem 'thin'
 # for async framework
@@ -31,7 +31,7 @@ group :development do
 end
 
 group :test do
-  gem 'rspec', '~> 2.10.0'
-  gem 'rack-test', '>= 0.5.3', :require => "rack/test"
+  gem 'rspec', '~> 2.14'
+  gem 'rack-test', '~> 0.6', :require => "rack/test"
   gem 'rhomobile-debug', ">= 1.0.2"
 end

data/generators/templates/application/spec/application_controller_spec.rb

@@ -1,23 +1,21 @@
 require File.join(File.dirname(__FILE__),'..','..','spec_helper')
 
 describe "ApplicationController" do
-  it_should_behave_like "SpecHelper" do
-  	include Rack::Test::Methods
-  	include Rhoconnect
+  include_examples "SpecHelper"
+	include Rack::Test::Methods
+	include Rhoconnect
 
-    def app
-      @app = Rack::URLMap.new Rhoconnect.url_map
-    end
+  def app
+    @app = Rack::URLMap.new Rhoconnect.url_map
+  end
 
-    it "should process ApplicationController /login" do
-      post "/rc/#{Rhoconnect::API_VERSION}/app/login", {"login" => 'testuser', "password" => ''}.to_json, 
-            {'CONTENT_TYPE'=>'application/json; charset=UTF-8'}
-      last_response.status.should == 200
-    end
+  it "should process ApplicationController /login" do
+    post "/rc/#{Rhoconnect::API_VERSION}/app/login", {"login" => 'testuser', "password" => ''}.to_json,
+          {'CONTENT_TYPE'=>'application/json; charset=UTF-8'}
+    last_response.status.should == 200
+  end
 
-    it "should process ApplicationController /rps_login" do
-      pending
-    end
-
-  end  
+  it "should process ApplicationController /rps_login" do
+    pending
+  end
 end

data/generators/templates/application/spec/js_spec.rb

@@ -1,25 +1,25 @@
 require File.join(File.dirname(__FILE__),'..','spec_helper')
 
 describe "<%=class_name%>", :type => :feature do
-  it_should_behave_like "SpecHelper" do
-    before :each do
-      setup_test_for '<%=class_name%>','testuser'
-    end
-  
-    it "queries <%=class_name%>" do
-    
-    end
-  
-    it "creates <%=class_name%>" do
-    
-    end
-  
-    it "updates <%=class_name%>" do
-    
-    end
-  
-    it "deletes <%=class_name%>" do
-    
-    end
+  include_examples "SpecHelper"
+
+  before :each do
+    setup_test_for '<%=class_name%>','testuser'
+  end
+
+  it "queries <%=class_name%>" do
+
+  end
+
+  it "creates <%=class_name%>" do
+
+  end
+
+  it "updates <%=class_name%>" do
+
+  end
+
+  it "deletes <%=class_name%>" do
+
   end
 end

data/generators/templates/application/spec/spec_helper.rb

@@ -17,7 +17,7 @@ include Rhoconnect
 require 'rhoconnect/application/init'
 require 'rhoconnect/test_methods'
 
-shared_examples_for "SpecHelper" do
+shared_examples "SpecHelper" do
   include Rhoconnect::TestMethods
 
   before(:each) do

data/generators/templates/source/controllers/ruby/controller_spec.rb

@@ -1,27 +1,26 @@
 require File.join(File.dirname(__FILE__),'..','..','spec_helper')
 
 describe "<%=class_name%>Controller" do
-  it_should_behave_like "SpecHelper" do
-  	include Rack::Test::Methods
-  	include Rhoconnect
+  include_examples "SpecHelper"
+	include Rack::Test::Methods
+	include Rhoconnect
 
-    def app
-      @app = Rack::URLMap.new Rhoconnect.url_map
-    end
+  def app
+    @app = Rack::URLMap.new Rhoconnect.url_map
+  end
 
-    before(:each) do
-      setup_test_for <%=class_name%>,'testuser'
-      # login user to establish session cookie before each test
-      post "/rc/#{Rhoconnect::API_VERSION}/app/login", {"login" => 'testuser', "password" => ''}.to_json, {'CONTENT_TYPE'=>'application/json; charset=UTF-8'}
-      last_response.status.should == 200
-    end
+  before(:each) do
+    setup_test_for <%=class_name%>,'testuser'
+    # login user to establish session cookie before each test
+    post "/rc/#{Rhoconnect::API_VERSION}/app/login", {"login" => 'testuser', "password" => ''}.to_json, {'CONTENT_TYPE'=>'application/json; charset=UTF-8'}
+    last_response.status.should == 200
+  end
 
-    it "should process <%=class_name%>Controller GET" do
-      pending
-    end
+  it "should process <%=class_name%>Controller GET" do
+    pending
+  end
 
-    it "should process <%=class_name%>Controller POST" do
-      pending
-    end
-  end  
+  it "should process <%=class_name%>Controller POST" do
+    pending
+  end
 end

data/generators/templates/source/models/ruby/model_spec.rb

@@ -1,25 +1,25 @@
 require File.join(File.dirname(__FILE__),'..','..','spec_helper')
 
 describe "<%=class_name%>" do
-  it_should_behave_like "SpecHelper" do
-    before(:each) do
-      setup_test_for <%=class_name%>,'testuser'
-    end
+  include_examples "SpecHelper"
 
-    it "should process <%=class_name%> query" do
-      pending
-    end
+  before(:each) do
+    setup_test_for <%=class_name%>,'testuser'
+  end
 
-    it "should process <%=class_name%> create" do
-      pending
-    end
+  it "should process <%=class_name%> query" do
+    pending
+  end
 
-    it "should process <%=class_name%> update" do
-      pending
-    end
+  it "should process <%=class_name%> create" do
+    pending
+  end
 
-    it "should process <%=class_name%> delete" do
-      pending
-    end
-  end  
+  it "should process <%=class_name%> update" do
+    pending
+  end
+
+  it "should process <%=class_name%> delete" do
+    pending
+  end
 end

data/install.sh

@@ -51,7 +51,7 @@ checkDeps ()
 determinePkgMgr ()
 {
   if [[ `which apt-get 2> /dev/null` != "" ]]; then
-    pkgMgr="apt-get -y"
+    pkgMgr="apt-get --force-yes -y"
     dist='debian'
   elif [[ `which yum 2> /dev/null` != "" ]]; then
     pkgMgr="yum -y"
@@ -167,23 +167,12 @@ setDefaults ()
 
 setRubyVars ()
 {
-  if [[ $rubyVersion == "" || $rubyVersion =~ ruby'ee'|'enterprise' ]]; then
-    rubyVersion=${RUBY_VERSION}
-    rubyDir=${RUBY_VERSION}
-    rubyTar="${rubyDir}.tar.gz"
-    rubyURL="http://ftp.ruby-lang.org/pub/ruby/1.9/${rubyTar}"
-  elif [$rubyVersion == "ruby187"]; then
-    rubyDir="ruby-1.8.7"
-    rubyTar="${rubyDir}.tar.gz"
-    rubyURL="ftp://ftp.ruby-lang.org/pub/ruby/1.8/${rubyTar}"
-  elif [$rubyVersion == "ruby192"]; then
-    rubyDir="ruby-1.9.2-p180"
-    rubyTar="${rubyDir}.tar.gz"
-    rubyURL="http://ftp.ruby-lang.org/pub/ruby/1.9/${rubyTar}"
-  else
-    echo "${rubyVersion} is not a valid ruby version" | tee -a $log
-    exit 1
-  fi
+  # RUBY_VERSION="ruby-2.2.1"
+  rubyVersion=${RUBY_VERSION}
+  rubyDir=${RUBY_VERSION}
+  rubyTar="${rubyDir}.tar.gz"
+  # http://cache.ruby-lang.org/pub/ruby/2.2/ruby-2.2.1.tar.gz
+  rubyURL="http://cache.ruby-lang.org/pub/ruby/2.2/${rubyTar}"
 }
 
 installRuby ()
@@ -263,10 +252,10 @@ rubyVersion=""
 rubyBinDir=""
 
 # Define ruby and nodejs versions to be installed ...
-RUBY_PATCH="p484"
-RUBY_VERSION="ruby-1.9.3-${RUBY_PATCH}"
+RUBY_PATCH="p85"
+RUBY_VERSION="ruby-2.2.1"
 
-NODE_VERSION=v0.10.22
+NODE_VERSION=v0.10.33
 NODE_URL=http://nodejs.org/dist/${NODE_VERSION}/node-${NODE_VERSION}.tar.gz
 ARCH=$([[ `uname -m` == x86_64 ]] && echo "x64" || echo "x86")
 NODE_BIN_URL=http://nodejs.org/dist/${NODE_VERSION}/node-${NODE_VERSION}-linux-${ARCH}.tar.gz

data/installer/unix-like/rho_connect_install_constants.rb

@@ -8,16 +8,16 @@ module Constants
                            "libaprutil1-dev",
                            "dtach"]
 
-  RUBY                    = "ruby-1.9.3-p484"
-  REDIS                   = "redis-2.6.16"
-  SQLITE3                 = "sqlite-autoconf-3071502"
-  NGINX                   = "nginx-1.4.4"
+  RUBY                    = "ruby-2.2.1"
+  REDIS                   = "redis-2.8.17"
+  SQLITE3                 = "sqlite-autoconf-3080704"
+  NGINX                   = "nginx-1.6.2"
   PASSENGER_ROOT          = "/opt/rhoconnect/lib/ruby/gems/1.9.1/gems/passenger"
 
   SOFTWARE                = [ REDIS, SQLITE3, RUBY, NGINX ]
 
   REDIS_URL               = "http://download.redis.io/releases/#{REDIS}.tar.gz"
-  SQLITE3_URL             = "http://www.sqlite.org/#{SQLITE3}.tar.gz"
+  SQLITE3_URL             = "http://www.sqlite.org/2014/#{SQLITE3}.tar.gz"
   NGINX_URL               = "http://nginx.org/download/#{NGINX}.tar.gz"
   URLS                    = [ REDIS_URL, SQLITE3_URL, NGINX_URL]
   GEMS                    = ["bundler"] # foreman"