Permalink
Browse files

config.example (Autosaved).txt removed

config.example (Autosaved).txt removed as not really needed
.rmvrc updated to 1.9.3-head
config.example.yml corrected some caps
lib/siriproxy/command_line.rb updated to match my fork, small cosmetic fixes in command description
  • Loading branch information...
1 parent e5bb2f2 commit 722ad75a382ac3b60551bb907c32fdd7fffd1cfe @FSE committed Jan 15, 2012
Showing with 13 additions and 48 deletions.
  1. +1 −1 .rvmrc
  2. +0 −34 config.example (Autosaved).txt
  3. +4 −5 config.example.yml
  4. +8 −8 lib/siriproxy/command_line.rb
View
2 .rvmrc
@@ -1 +1 @@
-rvm 1.9.3@SiriProxy --create
+rvm 1.9.3-head@SiriProxy --create
@@ -1,34 +0,0 @@
-port: 443
-log_level: 1
-db_host: 'localhost'
-db_user: 'root'
-db_pass: 'password'
-db_database: 'siri'
-
-plugins:
- # NOTE: run bundle after changing plugin configurations to update required gems
-
- - name: 'Example'
- path: './plugins/siriproxy-example'
-
- # - name: 'Thermostat'
- # git: 'git://github.com/plamoni/SiriProxy-Thermostat.git'
- # host: '192.168.2.71'
-
- # - name: 'Twitter'
- # path: './plugins/siriproxy-twitter' # path works just like specifing in gemfile
- # consumer_key: "YOUR_KEY"
- # consumer_secret: "YOUR_SECRET"
- # oauth_token: "YOUR_TOKEN"
- # oauth_token_secret: "YOUR_TOKEN_SECRET"
-
- # Note: Eliza should not be run with other plugins
- # - name: 'Eliza'
- # path: './plugins/siriproxy-eliza' # path works just like specifing in gemfile
-
- # Below are not actual plugins, just further example of config options
-
- # - SimplePlugin # simple syntax for plugins that are in rubygems and have no config
-
- # - name: 'AnotherPlugin'
- # git: 'git://github.com/netpro2k/SiriProxy-AnotherPlugin.git' # git works just like specifying in Gemfile
View
@@ -1,10 +1,9 @@
port: 443
log_level: 1
-DB_HOST: 'localhost'
-DB_USER: 'root'
-DB_PASS: 'password'
-DB_DATABASE: 'siri'
-
+db_host: 'localhost'
+db_user: 'root'
+db_pass: 'password'
+db_database: 'siri'
plugins:
# NOTE: run bundle after changing plugin configurations to update required gems
@@ -13,7 +13,7 @@ class SiriProxy::CommandLine
BANNER = <<-EOS
Siri Proxy is a proxy server for Apple's Siri "assistant." The idea is to allow for the creation of custom handlers for different actions. This can allow developers to easily add functionality to Siri.
- See: http://github.com/jaminmc/SiriProxy/
+ See: http://github.com/FSE/SiriProxy/
Usage: siriproxy COMMAND OPTIONS
@@ -117,12 +117,12 @@ def update(directory=nil)
else
branch_opt = @branch ? "-b #{@branch}" : ""
@branch = "master" if @branch == nil
- puts "=== Installing latest code from git://github.com/jaminmc/SiriProxy.git [#{@branch}] ==="
+ puts "=== Installing latest code from git://github.com/FSE/SiriProxy.git [#{@branch}] ==="
tmp_dir = "/tmp/SiriProxy.install." + (rand 9999).to_s.rjust(4, "0")
`mkdir -p #{tmp_dir}`
- puts `git clone #{branch_opt} git://github.com/jaminmc/SiriProxy.git #{tmp_dir}` if $?.exitstatus == 0
+ puts `git clone #{branch_opt} git://github.com/FSE/SiriProxy.git #{tmp_dir}` if $?.exitstatus == 0
puts "=== Performing Rake Install ===" if $?.exitstatus == 0
puts `cd #{tmp_dir} && rake install` if $?.exitstatus == 0
puts "=== Bundling ===" if $?.exitstatus == 0
@@ -153,19 +153,19 @@ def parse_options
opts.on('-b', '--branch BRANCH', '[update] Choose the branch to update from (default: master)') do |branch|
@branch = branch
end
- opts.on('-n', '--name CA_NAME', '[gencerts] Define a common name for the CA (default: "SiriProxyCA")') do |ca_name|
+ opts.on('-n', '--name CA_NAME', '[gencerts] Define a common name for the CA (default: "SiriProxyCA")') do |ca_name|
@ca_name = ca_name
end
- opts.on('-dbhost', '--db_host Hostname', '[server] Define a host name for mysql (default: "localhost")') do |db_host|
+ opts.on('-dbhost', '--db_host Hostname', '[server] Define a host name for mysql (default: "localhost")') do |db_host|
$APP_CONFIG.db_host = db_host
end
- opts.on('-dbuser', '--db_user username', '[server] Define a user name for mysql (default: "root")') do |db_user|
+ opts.on('-dbuser', '--db_user username', '[server] Define a user name for mysql (default: "root")') do |db_user|
$APP_CONFIG.db_user = db_user
end
- opts.on('-dbpass', '--db_pass password', '[server] Define a password for mysql (default: "password")') do |db_pass|
+ opts.on('-dbpass', '--db_pass password', '[server] Define a password for mysql (default: "password")') do |db_pass|
$APP_CONFIG.db_pass = db_pass
end
- opts.on('-dbdatabase', '--db_database database', '[server] Define the database for mysql (default: "siri")') do |db_database|
+ opts.on('-dbdatabase', '--db_database database', '[server] Define the database for mysql (default: "siri")') do |db_database|
$APP_CONFIG.db_database = db_database
end
opts.on_tail('-v', '--version', ' show version') do

0 comments on commit 722ad75

Please sign in to comment.