codebase 3.1.4 → 3.1.5

data/lib/codebase/command.rb

@@ -75,8 +75,12 @@ module Codebase
       case res
       when Net::HTTPSuccess
         return res.body
+      when Net::HTTPForbidden, Net::HTTPUnauthorized
+        puts "Access Denied. Ensure you have correctly configured your local Gem installation using the 'cb setup' command."
+        Process.exit(1)
       else
         puts res.body
+        
         return false
       end
     end

data/lib/codebase/commands/setup.rb

@@ -8,20 +8,14 @@ module Codebase
       def setup
         puts "\e[33;44mWelcome to the CodebaseHQ Initial Setup Tool\e[0m"
         puts "This tool will get your local computer configured to use your codebase account. It will automatically configure"
-        puts "the gem for API access as well as uploading your public key file to your Codebase user account."  
+        puts "the gem for API access so you can use many of the gem functions."  
         puts
         
         ## Is this configured?
         if u = git_config_variable(:username)
           puts "This system is already configured as \e[32m#{u}\e[0m."
-          domain    = git_config_variable(:domain)
-          username  = u
-          api_key   = git_config_variable(:apikey)
-          
-          unless agree("Are you sure you wish to continue with uploading your public keys?")
-            puts "OK, no problem."
-            return
-          end
+          puts "You can run 'cb unsetup' to clear settings."
+          return
         else
           ## Get some details
           domain    = ask_with_validation("CodebaseHQ domain (e.g. widgetinc.codebasehq.com): ", /\A(\w+).(codebasehq|cbhqdev).(com|local)\z/)
@@ -41,22 +35,7 @@ module Codebase
             return
           end
         end
-        
-        ## Send the user's public key to the server if they don't already have keys...
-        key_file = File.expand_path(File.join('~', '.ssh', 'id_rsa.pub'))
-        if File.exist?(key_file)
-          key = File.read(key_file)        
-          description = "Key from #{machine_hostname}"
-          if api_request("http://#{domain}/users/#{username}/public_keys", username, api_key, "<public-key><description>#{description}</description><key>#{key}</key></public-key>")
-            puts "\e[32mPublic key from #{key_file} uploaded to your Codebase account on #{domain}.\e[0m"
-          else
-            puts "\e[37;41mWe couldn't upload your public key at this file. Please try later and verify your API key is correct.\e[0m"
-          end
-          
-        else
-          puts "No key file found at #{key_file}. Nothing to upload to Codebase."
-        end
-        
+                
       end
       
       def unsetup
@@ -79,14 +58,7 @@ module Codebase
         puts
         password
       end
-      
-      def machine_hostname
-        require 'socket'
-        Socket.gethostname
-      rescue
-        "local computer"
-      end
-      
+            
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: codebase
 version: !ruby/object:Gem::Version 
-  version: 3.1.4
+  version: 3.1.5
 platform: ruby
 authors: 
 - Adam Cooke