zillabyte-cli 0.0.24 → 0.1.0

data/lib/zillabyte/auth.rb

@@ -9,9 +9,9 @@ class Zillabyte::Auth
 
     attr_accessor :credentials
 
-    def login(auth_token)
-      if valid_credentials?(auth_token)
-        write_credentials(auth_token)
+    def login(email, auth_token)
+      if valid_credentials?(email, auth_token)
+        write_credentials(email, auth_token)
       end
     end
 
@@ -31,17 +31,21 @@ class Zillabyte::Auth
     def host
       default_host
     end
+    
+    def git_host
+      ENV['ZILLABYTE_GIT_HOST'] || 'git.zillabyte.com'
+    end
 
-    # def user    # :nodoc:
-    #   get_credentials[0]
-    # end
+    def user    # :nodoc:
+      get_credentials[0]
+    end
 
     # def password    # :nodoc:
 #       get_credentials[1]
 #     end
 
     def api_key
-      get_credentials
+      get_credentials[1]
     end
 
     def get_credentials   # :nodoc:
@@ -71,15 +75,25 @@ class Zillabyte::Auth
         end
       end
     end
+    
+    
+    def email?(s)
+      !!(s =~ /\A[\w+\-.]+@[a-z\d\-.]+\.[a-z]+\z/i)
+    end
 
     def read_credentials
       if ENV['ZILLABYTE_API_KEY']
-        ENV['ZILLABYTE_API_KEY']
+        ary = ENV['ZILLABYTE_API_KEY'].split(",")
+        if ary.size != 2 or !email?(ary[0])
+          abort("ZILLABYTE_API_KEY must be comma delimited: user@email.com,api_key")
+        end
+        ary
       else
         # read netrc credentials if they exist
         if netrc
-          if netrc[host]
-            netrc[host][1]
+          if netrc[host] && email?(netrc[host][0])
+            # Make sure we have the email address
+            netrc[host]
           else
             nil
           end
@@ -87,11 +101,12 @@ class Zillabyte::Auth
       end
     end
 
-    def write_credentials(auth_token)
+    def write_credentials(email, auth_token)
       begin
         FileUtils.mkdir_p(File.dirname(netrc_path))
         FileUtils.touch(netrc_path)
-        netrc[host] = ["login", auth_token] 
+        FileUtils.chmod 0600, netrc_path
+        netrc[host] = [email, auth_token] 
         netrc.save
       rescue Zillabyte::Auth::NetrcError => error
         display 'Netrc Read or Save Error'
@@ -135,7 +150,7 @@ class Zillabyte::Auth
       end
     end
 
-    def valid_credentials?(auth_token)
+    def valid_credentials?(email, auth_token)
       api = Zillabyte::API.new(:api_key => auth_token, :session => self)
       response = api.request(
         :expects  => 200,
@@ -143,7 +158,6 @@ class Zillabyte::Auth
         :path     => "/cli/login"
       )
       response.body != "authentication error"
-      
     end
 
     def ask_for_and_save_credentials
@@ -162,17 +176,30 @@ class Zillabyte::Auth
         msg = "Enter your Zillabyte credentials"
         msg += " (or press enter to continue as an anonymous user)." if current_command == "relations" 
         puts msg
+        
+        # Get the email address
+        print "Email: " 
+        $stdout.flush()
+        email = ask
+        if email?(email) == false
+          display "invalid email"
+          exit 1 
+        end
+        
+        # Get the auth token
         print "Auth Token: "
         $stdout.flush()
         auth_token = ask
         print "\n"
+        
         if current_command == "relations" and auth_token == ""
           display "No auth token provided, continuing as anonymous user. Note that you will only be shown publicly available listings."
         else
-          if not valid_credentials?(auth_token)
+          if not valid_credentials?(email, auth_token)
             raise Zillabyte::Auth::InvalidCredentialsException
           else
-            write_credentials(auth_token)
+            # Success... 
+            write_credentials(email, auth_token)
           end
         end
       rescue Zillabyte::Auth::InvalidCredentialsException => e

data/lib/zillabyte/cli/#logs.rb#

@@ -0,0 +1,12 @@
+require "zillabyte/cli/base"
+
+# manage custom logs
+#
+class Zillabyte::Command::Logs < Zillabyte::Command::Base
+
+
+
+  
+  
+
+end

data/lib/zillabyte/cli/#repl.rb#

@@ -0,0 +1,43 @@
+require "zillabyte/cli/base"
+require 'readline'
+# REPL console for zillabyte commands
+#
+class Zillabyte::Command::Repl < Zillabyte::Command::Base
+
+  # repl
+  #
+  # start a console session for zillabyte
+  # --quiet # HIDDEN
+  # --history HISTORY# HIDDEN hack to allow history for readline
+  def index
+    if !options[:quiet]
+      v = `zillabyte version`
+      display "\n#{v}Type q,exit or Ctrl+D to quit\n\n"
+    end
+    server = `echo $ZILLABYTE_API_HOST` || ""
+    prompt = ""
+    if server && server.chomp.length > 0
+      prompt = "#{server.chomp} " 
+    end
+    prompt += "zillabyte $ "
+    if options[:history]
+      #p options[:history]
+      history = JSON.parse(options[:history])
+      history.last(50).each do |his|
+        # TODO: Handle single quotes ??
+        Readline::HISTORY << his
+      end
+    end
+    # TODO: Add tab completion for basic commands, app/relation names etc.
+    while cmd = Readline.readline(prompt, true)
+      if cmd && cmd.length > 0
+        if cmd.downcase == "exit" || cmd.downcase == "q"
+          display "" # TODO Make Ctrl+D print a newline too
+          return
+        else
+          exec "zillabyte #{cmd}; zillabyte repl --quiet --history '#{Readline::HISTORY.to_a.to_json}'"
+        end
+      end
+    end
+  end
+end