stastic 0.2.6 → 0.2.7

data/lib/stastic.rb

@@ -1,5 +1,5 @@
 module Stastic
 
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 
 end

data/lib/stastic/client.rb

@@ -44,12 +44,13 @@ module Stastic
       request(:delete, "/sites/#{site_id}/domains/#{domain_name}")
     end
 
-    def initialize(host = "https://stastic.com")
+    def initialize
       if Stastic::Config.exists?
         self.user = Stastic::Config.user
         self.token = Stastic::Config.token
+        self.host = Stastic::Config.host
       end
-      self.host = host
+      self.host ||= "https://stastic.com"
     end
 
     def request(method, uri, payload = nil, headers = {})

data/lib/stastic/commands/base.rb

@@ -50,6 +50,17 @@ module Stastic::Command
         return password
       end
 
+      def print_error_and_exit(e)
+        puts "Error."
+        puts "There was an error with the request:"
+        puts 
+        JSON.parse(e.response)['errors'].each do |msg|
+          printf("   * %s\n", msg)
+        end
+        puts
+        exit -1
+      end
+
       def with_valid_user
         request_credentials unless Stastic::Config.credentials?
         begin
@@ -58,13 +69,7 @@ module Stastic::Command
           request_credentials
           retry 
         rescue RestClient::UnprocessableEntity => e
-          puts "There was an error with the request:"
-          puts 
-          JSON.parse(e.response)['errors'].each do |msg|
-            printf("   * %s\n", msg)
-          end
-          puts
-          exit -1
+          print_error_and_exit(e)
         end
       end
 
@@ -77,10 +82,7 @@ module Stastic::Command
           request_credentials
           retry 
         rescue RestClient::UnprocessableEntity => e
-          puts "Error:"
-          puts e.response.to_s
-          puts
-          exit
+          print_error_and_exit(e)
         end
       end
 
@@ -89,7 +91,7 @@ module Stastic::Command
         puts 
         puts "  stastic create"
         puts
-        exit
+        exit -1
       end 
 
       def print_site_info(site, marker = " ")

data/lib/stastic/commands/create.rb

@@ -27,6 +27,7 @@ module Stastic::Command
     end
 
     def index
+      print "Creating site... "
       if template
         copy_template("#{File.dirname(__FILE__)}/../../../templates/#{template}/")
       end
@@ -41,7 +42,8 @@ module Stastic::Command
 
       if response["name"]
         Stastic::Config.add(:name => response["name"])
-        print "Your site has been created!\n\n"
+        print "Success!\n"
+        print "Your site has been created.\n\n"
         print "  Site Name: #{Stastic::Config.name}\n"
         print "  Site URL:  #{Stastic::Config.name}.stastic.com\n\n"
         print "Use `stastic publish` to publish your site whenever you're ready.\n"

data/lib/stastic/commands/rename.rb

@@ -18,6 +18,8 @@ module Stastic::Command
       end
       Stastic::Config.update(:name => response["name"])
       puts "Success\n"
+      print "  Site Name: #{Stastic::Config.name}\n"
+      print "  Site URL:  #{Stastic::Config.name}.stastic.com\n\n"
     end
 
   end

data/lib/stastic/config.rb

@@ -4,7 +4,7 @@ module Stastic
   module Config
     extend self
 
-    VALID_SETTINGS = %w(user token name site_id site_root)
+    VALID_SETTINGS = %w(user token name site_id site_root host)
     def exists?
       File.exists?(config_path) || File.exists?(global_path)
     end

data/lib/stastic/generator.rb

@@ -30,7 +30,7 @@ module Stastic
 
     def package(dir)
       tmpfile = Tempfile.new('st-archive')
-      system "cd #{dir} && tar -cjf #{tmpfile.path} -X #{exclude_file(dir)} . "
+      system "cd \"#{dir}\" && tar -cjf \"#{tmpfile.path}\" -X #{exclude_file(dir)} . "
       tmpfile.path
     end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 6
-  version: 0.2.6
+  - 7
+  version: 0.2.7
 platform: ruby
 authors: 
 - Brian Smith
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-09 00:00:00 -08:00
+date: 2011-03-30 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency