@@ -41,20 +41,6 @@ end
template do
-# Twitter app registation
-if twitter_auth
- # requires:
- # * sudo gem install twitter (need drnic version with register_oauth command)
- # * twitter install
- # * twitter add
- twitter_users = `twitter list | grep "^[* ] " | sed -e "s/[* ] //"`.split
- twitter_user = highline.choose(*twitter_users) do |menu|
- menu.prompt = "Which twitter user? "
- end
- message = run "twitter register_oauth #{twitter_user} '#{app_name}' http://#{app_url} '#{description}' organization='#{organization}' organization_url=http://#{domain}"
- twitter_auth_keys = parse_keys(message)
-end
-
# select slice + add CNAME
# github private repo + add self as collaborator if != github user
@@ -207,6 +193,19 @@ end
file 'app/views/protected/index.html.erb', '<h3><%= current_user.login %></h3>'
if twitter_auth
+ # Twitter app registation
+
+ # requires:
+ # * sudo gem install twitter (need drnic version with register_oauth command)
+ # * twitter install
+ # * twitter add
+ twitter_users = `twitter list | grep "^[* ] " | sed -e "s/[* ] //"`.split
+ twitter_user = highline.choose(*twitter_users) do |menu|
+ menu.prompt = "Which twitter user? "
+ end
+ message = run "twitter register_oauth #{twitter_user} '#{app_name}' http://#{app_url} '#{description}' organization='#{organization}' organization_url=http://#{domain}"
+ twitter_auth_keys = parse_keys(message)
+
append_file 'config/environments/development.rb', "\n\nOpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE\n"
append_file 'config/environments/test.rb', "\n\nOpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE\n"
@@ -268,18 +267,12 @@ end
# $ git remote add origin git@github.com:mocra/#{app_name}.git
# $ git push origin master
#
- # Create DNS entry for slicehost slice:
- # $ slicehost-dns add_cname #{domain} #{app_url} slice-name
- #
# After you can log into remote machine (cap deploy:setup)
# $ ssh #{app_url} -A
# # ssh git@github.com
# => 'yes'
# Hi drnic! You've successfully authenticated, but GitHub does not provide shell access.
#
- # twitter_auth
- # * register twitter app http://twitter.com/oauth_clients
- # * copy keys into twitter_auth.yml
require 'deprec'
@@ -337,6 +330,14 @@ end
git :add => '.'
git :commit => "-a -m 'Plugins and config'"
+# Setup slicehost slice
+
+ slices = slices_name_and_ip
+ slice_name = highline.choose(slices.keys.sort) do |menu|
+ menu.prompt = "Install application on which slice? "
+ end
+ run "slicehost-dns add_cname #{domain} #{app_name} #{slice_name}"
+
if twitter_auth
log "The next step is to edit config/twitter_auth.yml to reflect our OAuth client key and secret (to register your application log in to Twitter and visit http://twitter.com/oauth_clients)."
# `open http://intridea.com/2009/3/23/twitter-auth-for-near-instant-twitter-apps`
mocra.rb
@@ -43,7 +43,7 @@ describe "template_runner" do
end
describe "run template" do
before(:each) do
- @runner.highline.should_receive(:choose).and_return("drnic")
+ @runner.highline.should_receive(:choose).twice.and_return("drnic", "mocra-primary")
@runner.on_command(:run, "twitter register_oauth drnic 'rails-templates' http://rails-templates.mocra.com 'This is a cool app' organization='Mocra' organization_url=http://mocra.com") do
<<-EOS.gsub(/^ /, '')
Nice! You've registered your application successfully.
@@ -51,6 +51,11 @@ describe "template_runner" do
Consumer secret: CONSUMERSECRET
EOS
end
+ @runner.should_receive(:slices_name_and_ip).ordered.and_return({
+ 'mocra-primary' => '123.123.123.123',
+ 'mocra-secondary' => '65.65.65.65'
+ })
+
@runner.run_template
@log = @runner.full_log
end
@@ -60,6 +65,7 @@ describe "template_runner" do
it { @runner.files['config/twitter_auth.yml'].should_not be_nil }
it { @runner.files['config/twitter_auth.yml'].should =~ %r{oauth_consumer_key: CONSUMERKEY} }
it { @runner.files['config/twitter_auth.yml'].should =~ %r{oauth_consumer_secret: CONSUMERSECRET} }
+ it { @log.should =~ %r{executing slicehost-dns add_cname mocra.com rails-templates mocra-primary}}
end
end
end
mocra/spec/twitter_spec.rb
64d00bd839079eac84ac3b6532a16e92cbc5d483
Dr Nic Williams
drnicwilliams@gmail.com
http://github.com/sethbc/rails-templates/commit/5f8a354027b1a4faadfd48cfa36d62cc7586515f
5f8a354027b1a4faadfd48cfa36d62cc7586515f
2009-04-05T09:35:46-07:00
2009-03-27T21:42:41-07:00
slicehost gem used to list, select and assign cname for main zone
Signed-off-by: Seth Chandler <sethbc@sethbc.org>
e5cf07c3f4d9ac4446b8ff03f2c7006353f7f4c6
Seth Chandler
sethbc@sethbc.org