rhoconnect 3.4.5 → 4.0.0.beta.10

data/bin/rhoconnect

@@ -1,14 +1,16 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env ruby -W0
 require 'rubygems'
+
 begin
   if File.exists?(File.join(Dir.pwd,'Gemfile'))
     require 'bundler'
     Bundler.require
   end
   $:.unshift File.join(File.dirname(__FILE__),'..')
+  $:.unshift File.join(File.dirname(__FILE__),'..','lib')
   require 'templater'
   require 'generators/rhoconnect'
-  require 'lib/rhoconnect'
+  require 'rhoconnect'
   require 'commands/execute'
 
   Execute.start
@@ -21,6 +23,6 @@ rescue Exception => e
     puts "See http://docs.rhomobile.com/rhoconnect/install#upgrading-an-existing-application about update details.\n\n"
   else
     puts "Run rhoconnect command error: #{e.inspect}"
+    puts e.backtrace.join("\n")
   end
 end
-

data/commands/dtach/dtach_install.rb

@@ -28,9 +28,9 @@ def fetch(uri_str, limit = 10)
 end
 
 Execute.define_task do
-  desc 'dtach-install', 'Install dtach 0.8 from source'
+  desc 'dtach-install', 'Install dtach program from sources'
   def dtach_install
-    invoke :dtach_about
+    dtach_about
     
     unless windows?
       Dir.chdir('/tmp/')

data/commands/execute.rb

@@ -3,9 +3,7 @@
 require 'rubygems'
 require 'thor'
 require 'json'
-require 'zip/zip'
 require 'uri'
-require 'find'
 $:.unshift File.join(File.dirname(__FILE__), '.')
 $:.unshift File.join(File.dirname(__FILE__), '..')
 require 'lib/rhoconnect/utilities'
@@ -15,6 +13,13 @@ require 'utilities/redis_runner'
 
 include Utilities
 
+settings_file = File.join(File.dirname(__FILE__), '..', 'generators', 'templates', 'application', 'settings', "settings.yml")
+options = load_settings(settings_file)[Rhoconnect.environment]
+RHOCONNECT_PORT = URI.parse(options[:syncserver]).port
+REDIS_SERVER_URL = options[:redis]
+PUSH_SERVER_URL = options[:push_server]
+API_TOKEN = options[:api_token]
+
 class Execute < Thor
   no_tasks {
     def self.define_task(&block)
@@ -34,7 +39,7 @@ class Execute < Thor
     require 'bundler'
     tasks << 'rhoconnect_spec' if Bundler.load.specs.find{ |s| s.name == 'rspec' }
   end
-    
+  
   tasks.each do |dir|
     Dir.glob(File.join(File.dirname(__FILE__), "#{dir}", "*.rb")) do |file|
       require file

data/commands/generators/app.rb

@@ -1,6 +1,6 @@
 Execute.define_task do
-  desc "app NAME", "Generates a new rhoconnect application."
-  def app(name)
-    Rhoconnect.run_cli(Dir.pwd, 'thorhoconnect', Rhoconnect::VERSION, ARGV)
+  desc "app NAME [options]", "Generate a new rhoconnect application"
+  def app(name,platform=nil)
+    Rhoconnect.run_cli(Dir.pwd, 'rhoconnect', Rhoconnect::VERSION, ARGV)
   end #app
 end #do

data/commands/generators/controller.rb

@@ -0,0 +1,6 @@
+Execute.define_task do
+  desc "source NAME", "Generate a new source adapter controller"
+  def controller(name,platform='ruby')
+    Rhoconnect.run_cli(Dir.pwd, 'thorhoconnect', Rhoconnect::VERSION, ARGV)
+  end #source
+end #do

data/commands/generators/model.rb

@@ -0,0 +1,6 @@
+Execute.define_task do
+  desc "source NAME", "Generate a new source adapter model"
+  def model(name,platform='ruby')
+    Rhoconnect.run_cli(Dir.pwd, 'thorhoconnect', Rhoconnect::VERSION, ARGV)
+  end #model
+end #do

data/commands/generators/source.rb

@@ -1,6 +1,6 @@
 Execute.define_task do
-  desc "source NAME", "Generates a new source adapter."
-  def source(name)
-    Rhoconnect.run_cli(Dir.pwd, 'thorhoconnect', Rhoconnect::VERSION, ARGV)
+  desc "source NAME [options]", "Generate a new source adapter"
+  def source(name,platform=nil)
+    Rhoconnect.run_cli(Dir.pwd, 'rhoconnect', Rhoconnect::VERSION, ARGV)
   end #source
 end #do

data/commands/generators/update.rb

@@ -1,5 +1,5 @@
 Execute.define_task do
-  desc "update", "Updates an existing application to the latest rhoconnect release."
+  desc "update", "Update an existing application to the latest rhoconnect release"
   def update
     Bundler.with_clean_env do
       `bundle install`

data/commands/redis/redis_about.rb

@@ -2,5 +2,5 @@ Execute.define_task do
   desc "redis-about", 'About redis'
   def redis_about
     puts "\nSee http://redis.io/ for information about redis.\n\n"
-  end #about
-end #do
+  end
+end

data/commands/redis/redis_download.rb

@@ -1,4 +1,4 @@
-REDIS_RELEASE = "2.4.10"
+REDIS_RELEASE = "2.6.11"
 Execute.define_task do
   desc "redis-download", "Download redis release #{REDIS_RELEASE}"
   def redis_download

data/commands/redis/redis_install.rb

@@ -1,9 +1,10 @@
 Execute.define_task do
 desc "redis-install", 'Install the latest verison of Redis from Github (requires git, duh)'
   def redis_install
-    invoke :redis_about
-    invoke :redis_download
-    invoke :redis_make
+    redis_about
+    redis_download
+    redis_make
+
     unless windows?
       ENV['PREFIX'] and bin_dir = "#{ENV['PREFIX']}/bin" or bin_dir = "#{RedisRunner.prefix}bin"
 

data/commands/redis/redis_restart.rb

@@ -1,8 +1,8 @@
 Execute.define_task do
-  desc "redis-restart", 'Restart redis'
+  desc "redis-restart", 'Restart redis on localhost'
   def redis_restart
-    invoke :config
-    RedisRunner.stop
-    RedisRunner.start
+    redis_array = config[:redis]
+    RedisRunner.stop(redis_array)
+    RedisRunner.start(redis_array)
   end
 end

data/commands/redis/redis_start.rb

@@ -1,6 +1,7 @@
 Execute.define_task do
-  desc "redis-start", 'Start redis'
+  desc "redis-start", 'Start redis on localhost'
   def redis_start
-    RedisRunner.start
-  end #redis_start
-end #do
+    redis_array = config[:redis]
+    RedisRunner.start(redis_array)
+  end
+end

data/commands/redis/redis_startbg.rb

@@ -1,6 +1,7 @@
 Execute.define_task do
   desc "redis-startbg", "'Start redis' without dtach - for Rhostudio (internal)", :hide => true
-  def redis_startbg
-    RedisRunner.startbg
-  end #redis_startbg
-end #do
+   def redis_startbg
+    redis_array = config[:redis]
+    RedisRunner.startbg(redis_array)
+  end
+end

data/commands/redis/redis_status.rb

@@ -0,0 +1,13 @@
+Execute.define_task do
+  desc "redis-status", 'Show status of redis servers'
+  def redis_status
+    config[:redis].each do |redis|
+      host,port = redis.split(':')[0..1]
+      if RedisRunner.running?(redis)
+        puts "#{host}:#{port}: server running"
+      else
+        puts "#{host}:#{port}: server not running"
+      end
+    end
+  end
+end

data/commands/redis/redis_stop.rb

@@ -1,7 +1,7 @@
 Execute.define_task do
-  desc "redis-stop", 'Stop redis'
+  desc "redis-stop", 'Stop redis running on localhost'
   def redis_stop
-    invoke :config
-    RedisRunner.stop
+    redis_array = config[:redis]
+    RedisRunner.stop(redis_array)
   end
 end

data/commands/rhoconnect/config.rb

@@ -1,20 +1,32 @@
 Execute.define_task do
   desc "config", "Config", :hide => true
-  def config
-    $settings = load_settings(File.join('settings','settings.yml'))
-    $env = (ENV['RHO_ENV'] || ENV['RACK_ENV'] || :development).to_sym
-    
-    uri = URI.parse($settings[$env][:syncserver])
-    $url = "#{uri.scheme}://#{uri.host}"
-    $url = "#{$url}:#{uri.port}" if uri.port && uri.port != 80
-    $host = uri.host
-    $port = uri.port
-    $appname = $settings[$env][:syncserver].split('/').last
-    $token_file = File.join(ENV['HOME'],'.rhoconnect_token')
-    $token = File.read($token_file) if File.exist?($token_file)
-    # Redis options
-    redis_server = $settings[$env][:redis]
-    host, port, db, password = redis_server.split(':')  
-    $redis_options = { :host => host, :port => port, :db => db, :password => password }      
+  def config(settings_file=false)
+    if File.exist?(File.join('settings','settings.yml'))
+      settings = load_settings(File.join('settings','settings.yml'))
+      rackup_config = "config.ru"
+    elsif settings_file
+      settings = load_settings(settings_file)
+      rackup_config = File.join(File.dirname(__FILE__), '..', 'utilities', 'blank_app.ru')
+    elsif File.exist?(File.join(ENV['HOME'], '.rhoconnect.yml'))
+      settings = load_settings(File.join(ENV['HOME'], '.rhoconnect.yml'))
+      rackup_config = File.join(File.dirname(__FILE__), '..', 'utilities', 'blank_app.ru')
+    else
+      options = { :syncserver => "http://localhost:#{RHOCONNECT_PORT}",
+        :redis => REDIS_SERVER_URL, :push_server => PUSH_SERVER_URL, :api_token => API_TOKEN }
+      settings = { :development => options, :test => options, :production => options }
+      rackup_config = File.join(File.dirname(__FILE__), '..', 'utilities', 'blank_app.ru')
+    end
+    settings = settings[Rhoconnect.environment]
+    # syncserver settings
+    uri = URI.parse(settings[:syncserver])
+    port = uri.port unless port
+    url = "#{uri.scheme}://#{uri.host}:#{port}"
+    settings[:syncserver] = url
+    settings[:rackup] = rackup_config
+    # redis settings
+    redis_conf = settings[:redis]
+    settings[:redis] = [redis_conf] if redis_conf.is_a?(String)
+
+    settings
   end
 end

data/commands/rhoconnect/flushdb.rb

@@ -1,11 +1,10 @@
 Execute.define_task do
   desc "flushdb", "Flush data store - WARNING: THIS REMOVES ALL DATA IN RHOCONNECT"
   def flushdb
-    invoke :config
     puts "*** WARNING: THIS WILL REMOVE ALL DATA FROM YOUR REDIS STORE ***"
     confirm = ask "Are you sure (please answer yes/no)? "
     if confirm == 'yes'
-      RedisRunner.flushdb
+      RedisRunner.flushdb(config[:redis])
       puts "Database flushed..."
     else
       puts "Aborted..."

data/commands/rhoconnect/get_token.rb

@@ -1,12 +1,11 @@
 Execute.define_task do
-desc "get-token", "Fetches current api token from rhoconnect"
-  def get_token
-    invoke :config
+desc "get-token", "Fetch current api token from rhoconnect"
+  def get_token(save = true)
+    url = config[:syncserver]
     password = ''
-    login = ask "admin login: "
     begin
       system "stty -echo"
-      password = ask "\nadmin password: "
+      password = ask "admin password: "
       system "stty echo"
     rescue NoMethodError, Interrupt
       system "stty echo"
@@ -14,12 +13,17 @@ desc "get-token", "Fetches current api token from rhoconnect"
     end
     puts ''
     begin
-      $token = RestClient.post("#{$url}/api/admin/login", { :login => login, :password => password})
+      token = RestClient.post("#{url}/rc/v1/system/login",
+        { :login => 'rhoadmin', :password => password }.to_json, :content_type => :json)
     rescue
-      puts "Login failed."
+      puts "Rhoconnect server is not running or invalid credentials."
       exit
     end
-    File.open($token_file,'w') {|f| f.write $token}
-    puts "Token is saved in: #{$token_file}"
-  end #get_token
-end #do
+    if save
+      token_file = File.join(ENV['HOME'],'.rhoconnect_token')
+      File.open(token_file,'w') {|f| f.write(token)}
+      puts "Token is saved in: #{token_file}"
+    end
+    token
+  end
+end

data/commands/rhoconnect/restart.rb

@@ -1,7 +1,15 @@
 Execute.define_task do
-  desc "restart", "Alias for `rhoconnect stop; rhoconnect start`"
+  desc "restart [options]", "Alias for `rhoconnect stop; rhoconnect start`"
+  method_option :port, :aliases => "-p", :type => :numeric, :desc => "Use port (default: #{RHOCONNECT_PORT})"
+  method_option :redis, :aliases => "-r", :type => :string, :desc => "Redis server settings: (default: #{REDIS_SERVER_URL})"
+  method_option :push_server, :aliases => "-P", :type => :string, :desc => "Push server settings (default: #{PUSH_SERVER_URL})"
+  method_option :api_token, :aliases => "-t", :type => :string, :desc => "API token  (default: #{API_TOKEN})"
+  method_option :config, :aliases => "-f", :type => :string, :desc => "/path/to/rhoconnect/settings.yml file"  
+  method_option :licenseflie, :aliases => "-l", :type => :string, :desc => "/path/to/license.key file"
   def restart
-    invoke :stop
-    invoke :start
-  end #restart
-end #do
+    puts "Stop rhoconnect server ..."
+    stop
+    puts "Start rhoconnect server ..."
+    start options
+  end
+end

data/commands/rhoconnect/set_admin_password.rb

@@ -1,7 +1,7 @@
 Execute.define_task do
-  desc "set-admin-password", "Sets the admin password"
+  desc "set-admin-password", "Set the admin password"
   def set_admin_password
-    invoke :get_token
+    token = get_token(false)
     new_pass,new_pass_confirm = '',''
     begin
       system "stty -echo"
@@ -16,11 +16,11 @@ Execute.define_task do
       puts "\nNew password can't be empty."
     elsif new_pass == new_pass_confirm
       puts ""
-      RestClient.post("#{$url}/api/user/update_user", { :app_name => $appname,
-                                                        :api_token => $token,
-                                                        :attributes => { :new_password => new_pass } })
+      url = config[:syncserver]
+      RestClient.put("#{url}/rc/v1/users/rhoadmin",
+        { :attributes => { :new_password => new_pass }}.to_json, {:content_type => :json, 'X-RhoConnect-API-TOKEN' => token})
     else
       puts "\nNew password and confirmation must match."
-    end #if
-  end #set_admin_password
-end #do
+    end
+  end
+end

data/commands/rhoconnect/start.rb

@@ -1,26 +1,84 @@
 Execute.define_task do
-  desc "start", "Start rhoconnect server"
-  def start
-    invoke :config 
-    unless RedisRunner.running?
-      redis_config = "#{$redis_options[:host]}:#{$redis_options[:port]}"
-      puts "Redis is not running on #{redis_config}. Please start it by running 'rhoconnect redis-start' command."
-      exit
-    end
-    command = (jruby?) ? trinidad? : (thin? || mongrel? || report_missing_server)
-    if windows?
-      puts 'Starting rhoconnect...'
-      system "#{command} config.ru -P #{rhoconnect_pid}"
-    elsif jruby?
+  desc "start [options]", "Start rhoconnect server"
+  method_option :port, :aliases => "-p", :type => :numeric, :desc => "Use port (default: #{RHOCONNECT_PORT})"
+  method_option :redis, :aliases => "-r", :type => :string, :desc => "Redis server settings: (default: #{REDIS_SERVER_URL})"
+  method_option :push_server, :aliases => "-P", :type => :string, :desc => "Push server settings (default: #{PUSH_SERVER_URL})"
+  method_option :api_token, :aliases => "-t", :type => :string, :desc => "API token  (default: #{API_TOKEN})"
+  method_option :config, :aliases => "-f", :type => :string, :desc => "/path/to/rhoconnect/settings.yml file"
+  method_option :licenseflie, :aliases => "-l", :type => :string, :desc => "/path/to/license.key file"
+  def start(params = {})
+    # if this command called from 'restart', then params not emply
+    params = options if params.empty?
+
+    if options[:config] # -f settings.yml
+      unless File.exist?(options[:config])
+        puts "#{options[:config]}: No such file"
+        exit(-1)
+      end
+    end
+    if options[:licenseflie]  # -l license.key
+      unless File.exist?(params[:licenseflie])
+        puts "#{options[:licenseflie]}: No such file"
+        exit(-1)
+      end
+      licensefile = File.expand_path(options[:licenseflie])
+    end
+    settings = config(options[:config])
+
+    port = (params[:port]) ? params[:port] : URI.parse(settings[:syncserver]).port
+
+    redis_url = (params[:redis]) ? params[:redis] : settings[:redis]
+    redis_url = [redis_url] if redis_url.is_a?(String)
+    start_list = []
+    redis_url.each do |redis_inst|
+      start_list << redis_inst unless RedisRunner.running?(redis_inst)
+    end
+    RedisRunner.startbg(start_list) unless start_list.empty?
+
+    if File.exist?(File.join('settings','settings.yml'))
+      # If command running frorm app directory, then do't touch "~/.rhoconnect.yml"
+    else
+      unless File.exist?(File.join(ENV['HOME'], '.rhoconnect.yml'))
+        push_server = (params[:push_server]) ? params[:push_server] : PUSH_SERVER_URL
+        token = (params[:api_token]) ? params[:api_token] : API_TOKEN
+        options = { :syncserver => "http://localhost:#{port}", :redis => redis_url,
+            :push_server => push_server, :api_token => token }
+        options[:licensefile] = licensefile if licensefile
+        options[:secret] = SecureRandom.hex(64)
+        conf_hash = { :development => options, :test => options, :production => options }
+        File.open(File.join(ENV['HOME'], '.rhoconnect.yml'), 'w') { |f| f.write(conf_hash.to_yaml) }
+      end
+    end
+
+    command = "bundle exec rackup -s #{defined?(JRUBY_VERSION) ? 'puma' : 'thin'}"
+    rackup_config = settings[:rackup]
+    command.sub!(/bundle exec /, '') if(rackup_config != "config.ru")
+    # Set environment varialbes: 'API_TOKEN', 'REDIS_URL', 'RHOCONNECT_LICENSE'
+    env = {}
+    if params[:api_token]
+      env["API_TOKEN"] = params[:api_token]
+    end
+    if params[:redis]
+      env["REDIS_URL"] = params[:redis]
+    end
+    if licensefile
+      license = IO.read(licensefile).strip
+      env["RHOCONNECT_LICENSE"] = license
+    end
+
+    if jruby?
       puts 'Starting rhoconnect in jruby environment...'
-      system "#{command}"
+      system(env, "#{command} --port #{port} -P #{rhoconnect_pid} #{rackup_config}")
+    elsif windows?
+      puts 'Starting rhoconnect...'
+      system(env, "#{command} --port #{port} -P #{rhoconnect_pid} #{rackup_config}")
     else
       if dtach_installed?
         puts 'Detach with Ctrl+\  Re-attach with rhoconnect attach'
         sleep 2
-        cmd "dtach -A #{rhoconnect_socket} #{command} config.ru -P #{rhoconnect_pid}"
+        system(env, "dtach -A #{rhoconnect_socket} #{command} --port #{port} -P #{rhoconnect_pid} #{rackup_config}")
       else
-        cmd "#{command} config.ru -P #{rhoconnect_pid}"
+        system(env, "#{command} --port #{port} -P #{rhoconnect_pid} #{rackup_config}")
       end
     end
   end

data/commands/rhoconnect/startbg.rb

@@ -17,7 +17,7 @@ Execute.define_task do
         system "#{cmd} config.ru -P #{rhoconnect_pid}"
       elsif jruby?
         puts 'Starting rhoconnect in jruby environment...'
-        system "#{cmd}"
+        system "#{cmd} -r config.ru"
       else
         system "#{cmd} config.ru -P #{rhoconnect_pid}"
       end

data/commands/rhoconnect/startdebug.rb

@@ -18,7 +18,7 @@ Execute.define_task do
         system "#{cmd} config.ru -P #{rhoconnect_pid}"
       elsif jruby?
         puts 'Starting rhoconnect in jruby environment...'
-        system "#{cmd}"
+        system "#{cmd} -r config.ru"
       else
         system "#{cmd} config.ru -P #{rhoconnect_pid}"
       end

data/commands/rhoconnect/stop.rb

@@ -4,7 +4,19 @@ Execute.define_task do
     if windows?
       File.delete "#{rhoconnect_pid}" if system("FOR /F %A in (#{rhoconnect_pid}) do taskkill /F /PID %A")
     else
-      cmd "cat #{rhoconnect_pid} | xargs kill -3"
+      if File.exist?("#{rhoconnect_pid}")
+        pid = `cat #{rhoconnect_pid}` 
+        puts "Sending a QUIT signal to process #{pid}"
+        system "kill -3 #{pid}"
+        3.times do
+          sleep 1
+          return if !File.exist?("#{rhoconnect_pid}") 
+        end
+
+        puts "Process #{pid} is still running. Sending a KILL signal to it ..."
+        system "kill -9 #{pid}"
+        File.delete(rhoconnect_pid)
+      end
     end
   end
 end

data/commands/rhoconnect/web.rb

@@ -1,7 +1,7 @@
 Execute.define_task do
-  desc "web", "Launch the web console in a browser - uses :syncserver: in settings.yml"
+  desc "web", "Launch the web console in a browser"
   def web
-  	invoke :config
-    windows? ? system("start #{$url}") : system("open #{$url}")
-  end #web
-end #do
+    url = config[:syncserver]
+    windows? ? system("start #{url}") : system("open #{url}")
+  end
+end

data/commands/rhoconnect_console/console.rb

@@ -1,16 +1,18 @@
 Execute.define_task do
-desc "console [environment]", "run rhoconnect console"
+desc "console [environment]", "Run rhoconnect console"
   def console(environment=nil)
     ENV['RACK_ENV'] = environment || 'development'
-    application_file = ruby19? ? './application' : 'application'    
-    invoke :config
+    application_file = (File.exist?(File.join(Dir.pwd, 'application.rb'))) ?
+      File.join(Dir.pwd, 'application.rb') :
+      File.join(File.dirname(__FILE__), '..', '..', 'generators', 'templates', 'application', 'application.rb')
+
+    redis_url = config[:redis]
     if RedisRunner.running?
       system "irb -rubygems -r #{File.join(File.dirname(__FILE__),'console_helper')} " +
         "-r #{File.join(File.dirname(__FILE__), '..', '..', 'lib', 'rhoconnect') } " +
         "-r #{application_file}"
     else
-      redis_config = "#{$redis_options[:host]}:#{$redis_options[:port]}"
-      puts "Redis is not running on #{redis_config}. Please start it by running 'rhoconnect redis-start' command."
+      puts "Redis is not running on #{redis_url}. Please start it by running 'rhoconnect redis-start' command."
     end
   end
 end

data/commands/rhoconnect_war/war.rb

@@ -11,22 +11,22 @@ Execute.define_task do
         if aFile
           includeDirs = FileList['*'].exclude do |entry|
             entry if (not File.directory? entry) || (entry == 'spec')
-          end #if
+          end
           configFile = "Warbler::Config.new do |config|\n" +
-            "config.dirs = %w(#{includeDirs.join(' ')})\n" +
-            "config.includes = FileList[\"./*\"]\n" +
-            "config.excludes = FileList[\"./*.war\",'spec']\nend"
+            "  config.dirs = %w(#{includeDirs.join(' ')})\n" +
+            "  config.includes = FileList[\"./*\", \".rcgemfile\"]\n" +
+            "  config.excludes = FileList[\"./*.war\",'spec']\nend"
           aFile.write("#{configFile}")
           aFile.close
         else
           puts "Unable to create config/warble.rb file!"
-        end #if
-      end #if
+        end
+      end
       # build the executable WAR using the config/warble.rb file
       ENV['BUNDLE_WITHOUT'] = ['development','test'].join(':')
       system 'bundle exec warble executable war'
     else
       puts "Cannot build WAR files outside of JRuby environment!"
-    end #if
-  end #war
-end #do
+    end
+  end
+end