tane 0.0.1 → 0.0.2

data/lib/tane/commands/create.rb

@@ -1,19 +1,38 @@
 class Tane::Commands::Create < Tane::Commands::Base
-
   class << self
     def process(args)
+      verbose_say("Authenticating you...")
       authenticate_user
+      verbose_say("done!")
+      
       app_name = args[0] ||= term.ask("Please enter a name for your new app:     ") { |app_name| app_name }
       template_url = ENV['KIMONO_URL'] || "https://raw.github.com/Bushido/kimono/master/kimono.rb"
 
-      print "Creating a new Bushido rails app in #{ app_name } ... "
+      print "Creating a new Bushido rails app in ./#{ app_name } (please wait, it'll take a few minutes) ...    "
+
+      start_throbber!
 
-      system("rails new #{app_name} -m #{ template_url } > tane.log")
+      File.open("tane.log", "w") do |file|
+        IO.popen("rails new #{app_name} -m #{ template_url }", :error => [:child, :out]) do |io|
+          file.puts(io.read)
+        end
+      end
+      verbose_say("Finished creating rails app, initializing Bushido resources...")
 
       Dir.chdir("./#{app_name}")do
-        system("bundle exec tane init > ../tane.log")
+        File.open("tane.log", "w") do |file|
+          verbose = "--verbose" if opts.verbose
+          verbose ||= ""
+          IO.popen("bundle exec tane init #{verbose}", :error => [:child, :out]) do |io|
+            file.puts(io.read)
+          end
+        end
       end
 
+      verbose_say("done!")
+
+      stop_throbber!
+
       success_messages = ["Let the hacking commence!",
                           "Hacks and glory await!",
                           "Hack and be merry!",
@@ -21,24 +40,50 @@ class Tane::Commands::Create < Tane::Commands::Base
                           "May the source be with you!",
                           "Take this demi-REPL, dear friend, and may it serve you well.",
                           "Lemonodor-fame is but a hack away!",
-                          "Go forth to #{ app_name }, and hack for all you're worth - for all mankind!"]
+                          "Go forth to #{ app_name }, and hack for all you're worth - for all humankind!"]
+
+      bushirens = ["Sean", "Kevin", "Akash"]
 
       success_message = success_messages[ rand(success_messages.length) ]
+      bushiren        = bushirens       [ rand(bushirens.length)         ]
 
       FileUtils.mv("./tane.log", "./#{ app_name }/log/tane.log")
-      puts "Finished successfully!"
-      puts "Your app is now in ./#{ app_name } . #{ success_message }"
+      term.say "  Finished successfully!"
+      term.say "Your app is now in ./#{ app_name }"
+      
+      
+      Dir.chdir("./#{app_name}") do
+        term.say "Launching your new app!"
+        term.say "Check out once rails has finished booting http://localhost:3000"
+        term.say "#{bushiren} says, \"#{ success_message }\""
+        begin
+          # Do this in the background, it'll wait up to 120 seconds
+          # for the rails server to start up and launch a browser as
+          # soon as it's ready
+          verbose_say("Launching `tane open' in the background..")
+          system("tane open&")
+          verbose_say("done!")
+
+          suppress_env_vars("BUNDLE_BIN_PATH", "BUNDLE_GEMFILE", "RUBYOPT") do
+            verbose_say("launching rails app!")
+            exec("bundle exec tane exec rails s")
+          end
+        rescue Exception => ex
+          term.say "Oh no we tried to launch the app but failed. Please try launching it yourself with \n bundle exec tane exec rails s \n if you have problems let us know at support@bushi.do"
+        end
+      end
+
     end
 
     def help_text
       <<-EOL
 Usage:
 
-    tane claim email ido_id
+    tane create 'app_name'
 
-Notifies the app of an App.claimed event to the locally running app when the email and ido_id are passed.
+Creates a new Bushido-enabled rails app from scratch and launches it. Use this to get started with Bushido quickly and easily
 
-    tane claim john@example.com 6h284ah92jcj9m2sv21f
+    tane create my_example_app
 EOL
     end
   end

data/lib/tane/commands/init.rb

@@ -2,9 +2,13 @@ class Tane::Commands::Init < Tane::Commands::Base
 
   class << self
     def process(args)
+      verbose_say("authenticating you...")
       authenticate_user
+      verbose_say("done!")
       if in_rails_dir?
+        verbose_say("In a rails directory, tane initializing...")
         Tane::Helpers::Init.initialize_app
+        verbose_say("finished initializing!")
       else
         term.say("You have to be in the local rails app's root directory when running `tane init`")
         exit 1

data/lib/tane/commands/login.rb

@@ -31,7 +31,7 @@ class Tane::Commands::Login < Tane::Commands::Base
         term.say("Invalid username, or password, sorry! Don't worry though, we'll get you through this!")
 
         # returns auth_token on success
-        return signup_and_notify(email, password) if term.agree("would you like to try signing up with those credentials?")
+        return signup_and_notify(email, password) if term.agree("would you like to try signing up with those credentials? Y/N")
           
         display_help_messages_and_exit
       end

data/lib/tane/commands/open.rb

@@ -0,0 +1,33 @@
+require 'launchy'
+
+class Tane::Commands::Open < Tane::Commands::Base
+  class << self
+    def process(args)
+      timeout = opts.timeout || 120
+
+      started = try_for(:seconds => timeout) do
+        begin
+          RestClient.get("http://localhost:3000/")
+          true
+        rescue => e
+          false
+        end
+      end
+
+      Launchy.open("http://localhost:3000/") if started
+    end
+
+    def help_text
+      <<-EOL
+Usage:
+
+    tane open
+
+Waits until there's a webserver running at port 3000 and then opens the browser to it.
+
+    tane open
+EOL
+    end
+  end
+
+end

data/lib/tane/helpers/init_helper.rb

@@ -9,7 +9,7 @@ class Tane::Helpers::Init
       else
         app = create_app
         make_app_bushido_dir
-        save_envs(get_app_envs(app['name']))
+        save_envs(get_app_envs(app['app']['name']))
         save_emails
       end
 
@@ -23,9 +23,7 @@ class Tane::Helpers::Init
     # TODO: Replace envs_template with values retrieved from Bushido side
     def save_envs(env_vars)
       if File.exists?('.bushido/tane.yml')
-        if not term.agree('.bushido/tane.yml already exists! Are you sure you want to overwrite it?')
-          return
-        end
+        return if not term.agree('.bushido/tane.yml already exists! Are you sure you want to overwrite it? Y/N')
       end
 
       File.open('.bushido/tane.yml', 'w+') { |file| file.puts YAML.dump(envs_template(env_vars)) }
@@ -33,9 +31,7 @@ class Tane::Helpers::Init
 
     def save_emails
       if File.exists?("#{email_templates_path}/#{example_email_template.keys.first}")
-        if not term.agree("#{example_email_template.keys.first} already exists! Are you sure you want to overwrite it?")
-          return
-        end
+        return if not term.agree("#{example_email_template.keys.first} already exists! Are you sure you want to overwrite it? Y/N")
       end
 
       File.open("#{email_templates_path}/#{example_email_template.keys.first}", "w") do |file|
@@ -47,15 +43,15 @@ class Tane::Helpers::Init
     def envs_template(app_envs)
       envs = {}
       env_var_keys = [
-        'APP_TLD',              'BUNDLE_WITHOUT',   'BUSHIDO_APP',       'BUSHIDO_APP_KEY',
-        'BUSHIDO_DOMAIN',       'BUSHIDO_EVENTS',   'BUSHIDO_HOST',      'BUSHIDO_NAME',
-        'BUSHIDO_PROJECT_NAME', 'BUSHIDO_SALT',     'BUSHIDO_SUBDOMAIN',
-        'B_SQL_DB',             'B_SQL_PASS',       'B_SQL_USER',        'DATABASE_URL',
-        'HOSTING_PLATFORM',     'LANG',             'PUBLIC_URL',        'RACK_ENV',
-        'RAILS_ENV',            'S3_ACCESS_KEY_ID', 'S3_ARN',            'S3_BUCKET',
-        'SHARED_DATABASE_URL',  'S3_PREFIX',        'S3_SECRET_ACCESS_KEY',           
+        'APP_TLD',              'BUNDLE_WITHOUT',   'BUSHIDO_APP',          'BUSHIDO_APP_KEY',
+        'BUSHIDO_DOMAIN',       'BUSHIDO_EVENTS',   'BUSHIDO_HOST',         'BUSHIDO_NAME',
+        'BUSHIDO_PROJECT_NAME', 'BUSHIDO_SALT',     'BUSHIDO_SUBDOMAIN',    
+        'B_SQL_DB',             'B_SQL_PASS',       'B_SQL_USER',           'DATABASE_URL',
+        'HOSTING_PLATFORM',     'LANG',             'PUBLIC_URL',           'RACK_ENV',
+        'RAILS_ENV',            'S3_ACCESS_KEY_ID', 'S3_ARN',               'S3_BUCKET',
+        'SHARED_DATABASE_URL',  'S3_PREFIX',        'S3_SECRET_ACCESS_KEY', 'STS_SESSION_TOKEN',           
         'SMTP_AUTHENTICATION',  'SMTP_DOMAIN',      'SMTP_PASSWORD',
-        'SMTP_PORT',            'SMTP_SERVER',      'SMTP_TLS',          'SMTP_USER'
+        'SMTP_PORT',            'SMTP_SERVER',      'SMTP_TLS',             'SMTP_USER'
       ]
  
       env_var_keys.each { |env_var_key| envs[env_var_key] = app_envs[env_var_key] }

data/lib/tane/helpers.rb

@@ -11,6 +11,8 @@ module Tane
     end
 
     module ClassMethods
+      @should_throb = false
+
       def term
         @hl ||= HighLine.new
       end
@@ -64,7 +66,7 @@ module Tane
       end
 
       def bushido_app_exists?
-        File.exists?('.bushido/tane.yml') and File.exists?('.bushido/email.yml')
+        File.exists?('.bushido/tane.yml') and File.directory?('.bushido/emails')
       end
 
       def username
@@ -163,6 +165,83 @@ module Tane
 
         result
       end
+
+      def repeat_every(interval, &block)
+        Thread.new do
+          loop do
+            start_time = Time.now
+            yield
+            elapsed = Time.now - start_time
+            sleep([interval - elapsed, 0].max)
+          end
+        end
+      end
+
+      def start_throbber!
+        throbber_frames = ['|', '/', '-', '\\', 'X']
+        frame_counter = 0
+
+        @should_throb = true
+
+        thread = repeat_every(0.5) do
+          if @should_throb
+            print "\x08\x08\x08"
+            frame_counter += 1
+            frame_counter = 0 if frame_counter == throbber_frames.length
+            print "#{throbber_frames[frame_counter]}  "
+          end
+        end
+
+      end
+
+      def stop_throbber!
+        @should_throb = false
+      end
+
+      def should_throb
+        @should_throb
+      end
+
+      def should_throb=(value)
+        @should_throb = value
+      end
+
+      # Takes a list of ENV vars, records their value,
+      # sets them to null, runs the block, then ensures
+      # the ENV vars are restored at the end.
+      def suppress_env_vars(*vars, &block)
+        cache = {}
+        vars.each do |var|
+          cache[var] = ENV[var]
+        end
+
+        begin      
+          vars.each do |var|
+            ENV[var] = nil
+          end
+          yield block
+        ensure
+          cache.each_pair do |key, value|
+            ENV[key] = value
+          end
+        end
+      end
+
+      def try_for(options, &block)
+        options[:seconds] ||= 30
+        options[:sleep]   ||= 5
+
+        start = Time.now
+        elapsed = 0
+
+        while elapsed < options[:seconds]
+          return true if yield elapsed
+          sleep options[:sleep]
+          elapsed = Time.now - start
+        end
+
+        return false
+      end      
     end
   end
 end

data/lib/tane/version.rb

@@ -1,3 +1,3 @@
 module Tane
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/helpers/init_helper_spec.rb

@@ -64,14 +64,14 @@ describe Tane::Helpers::Init do
   end
 
   describe "save_emails" do
-    it "should write a .bushido/emails.yml file if it does not exist" do
+    it "should create a sample email template file to .bushido/emails dir if it does not exist" do
       File.should_receive(:exists?).and_return(false)
       File.should_receive(:open)
 
       Tane::Helpers::Init.save_emails
     end
 
-    it "should write a .bushido/emails.yml file if it already exists and if the user agrees to an overwrite" do
+    it "should create a sample email template file if it already exists and if the user agrees to an overwrite" do
       File.should_receive(:exists?).and_return(true)
       Tane::Helpers::Init.term.should_receive(:agree).and_return(true)
       File.should_receive(:open)
@@ -79,7 +79,7 @@ describe Tane::Helpers::Init do
       Tane::Helpers::Init.save_emails
     end
 
-    it "should not write a .bushido/emails.yml file if the user says no to an overwrite" do
+    it "should not create a sample email template file if the user says no to an overwrite" do
       File.should_receive(:exists?).and_return(true)
       Tane::Helpers::Init.term.should_receive(:agree).and_return(false)
       File.should_not_receive(:open)

data/spec/helpers_spec.rb

@@ -81,8 +81,9 @@ describe "Tane::Helpers" do
     end
 
     describe "bushido_app_exists?" do
-      it "it should return true if the tane.yml and email.yml exists in the current directory" do
-        File.should_receive(:exists?).twice.and_return(true)
+      it "it should return true if the .bushido/tane.yml file and .bushido/emails dir exists in the current directory" do
+        File.should_receive(:exists?).and_return(true)
+        File.should_receive(:directory?).and_return(true)
         Tane::Helpers::Example.bushido_app_exists?.should be_true
       end
     end
@@ -111,7 +112,7 @@ describe "Tane::Helpers" do
     describe "make_app_bushido_dir" do
       it "should create a .bushido dir in the current dir if it does not have one" do
         Tane::Helpers::Example.should_receive(:bushido_app_exists?).and_return(false)
-        FileUtils.should_receive(:mkdir_p).with(".bushido")
+        FileUtils.should_receive(:mkdir_p).with(".bushido/emails")
         Tane::Helpers::Example.make_app_bushido_dir
       end
 

data/tane.gemspec

@@ -22,7 +22,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec"
   s.add_dependency "awesome_print"
   s.add_dependency "rake"
-  s.add_dependency "rails", "<=3.1.0"
+  s.add_dependency "launchy"
+  s.add_dependency "rails", "~> 3.1.0"
   s.add_runtime_dependency "erubis"
   s.add_runtime_dependency "rest-client"
   s.add_runtime_dependency "highline"

metadata

@@ -2,7 +2,7 @@
 name: tane
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Bushido Team
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-23 00:00:00 Z
+date: 2012-01-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -46,29 +46,29 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rails
+  name: launchy
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - <=
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 3.1.0
+        version: "0"
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: erubis
+  name: rails
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 3.1.0
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: rest-client
+  name: erubis
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -79,7 +79,7 @@ dependencies:
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: highline
+  name: rest-client
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -89,6 +89,17 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: highline
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  version_requirements: *id008
 description: This gem provides all the tools necessary to develop a rails app meant for deployment on Bushido locally
 email: 
 - support@gobushido.com
@@ -117,6 +128,7 @@ files:
 - lib/tane/commands/init.rb
 - lib/tane/commands/login.rb
 - lib/tane/commands/logout.rb
+- lib/tane/commands/open.rb
 - lib/tane/commands/refresh.rb
 - lib/tane/commands/signup.rb
 - lib/tane/commands/support.rb
@@ -166,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: tane
-rubygems_version: 1.8.11
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Enables local development of Bushido apps