mozzn 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc728053eb2673b230d6cca92c0ef60015bfb8fd
-  data.tar.gz: 8d4bdfff003e054e23d6a40bc4efcc36a3e50b0c
+  metadata.gz: b32a146475f55c41943db377119d126dbca9fd00
+  data.tar.gz: 55019427b77f4474b78092e62919a15ae23ebfce
 SHA512:
-  metadata.gz: 0a063774968c2bc3aab49346a5bf572f8c0c2933b9d44f55e7a1b4664ad6fc85ffec6e6212c4addebdf731baf06c0ee7580808d4f40839045a4dbfa4719dea9b
-  data.tar.gz: b2a614e7ba900028bffc37f35354e1002896153fa43d58020e86457d4a5c9a78a0a0aa017f080c7fb1f115b6fd73f7c499430949c47cee6be5d5ed11f23849d4
+  metadata.gz: 3b02f8b487ed7fc49018937888d143f384ac6b2bdc2d48de869c54d078681920784101989c8f6cffa20e9be194bd0566c0f2c6edc4bd76b16e10fd25a66c8d04
+  data.tar.gz: 928091596f1ae6d18583b198208b6801fa5517ecb37def5be973addd8b278723935e1375c46128ba24f02359a3b50dc2c4f19b1fa276d33fc5d55fb14386b324

data/bin/mozzn

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+trap(:INT) { puts 'Exiting...'; exit 1 }
+
 require 'mozzn'
 
 # Start our command line interface

data/lib/mozzn/api.rb

@@ -8,7 +8,11 @@ module Mozzn
     attr_accessor :token
     
     def initialize token = nil
-      @connection = Faraday.new('http://mozzn.com/api/v1/')
+      if ENV['GEM_ENV'] == 'test'
+        @connection = Faraday.new('http://localhost:3000/api/v1/')
+      else
+        @connection = Faraday.new('http://mozzn.com/api/v1/')
+      end
       @token = token
     end
 

data/lib/mozzn/cli.rb

@@ -5,157 +5,17 @@ require 'rubygems'
 require 'git'
 require 'mozzn/version'
 require 'terminal-table'
+require "mozzn/commands/key"
+require "mozzn/commands/app"
+require "mozzn/commands/auth"
 
 module Mozzn
   class Cli < Thor
     include Thor::Actions
     
-    trap(:INT) { exit 1 }
-    
     default_task :help
 
-    desc 'login', 'Login with your mozzn credentials, an interactive shell will ask you about your email and password'
-    # mozzn login
-    method_option :email, :aliases => "-u", :desc => "Mozzn email"
-    method_option :password, :aliases => "-p", :desc => "Mozzn password" 
-    def login
-      mozzn = Mozzn::Api.new
-      if options[:email].nil? && options[:password].nil?
-        hl = HighLine.new
-        email = hl.ask 'Mozzn email: '
-        password = hl.ask('Mozzn password (we will not store this): ') { |q| q.echo = "*" }
-      elsif options[:email].nil? || options[:password].nil?
-        raise Thor::Error, "Email and password must be provided!"
-      else
-        email = options[:email]
-        password = options[:password]
-      end
-      params = {
-        user: {
-          email: email,
-          password: password
-        }
-      }
-      response = mozzn.post(:sessions, params)
-      auth_token = response['data']['auth_token']
-      if auth_token == nil
-        raise Thor::Error, response['info']
-      else
-        Mozzn::Config.new.add('token', auth_token) 
-        say response['info'], :green 
-        git_check
-        ssh_key_check
-      end
-    rescue Mozzn::Disconnected
-      say 'Unable to connect to Mozzn. Please check your internet connection.', :red
-    rescue Mozzn::UnexpectedOutput
-      say 'UnexpectedOutput', :red
-    end
-
-    desc 'add_key', 'Add your SSH Public Key directily or add its path'
-    method_option :public_key, :aliases => "-k", :desc => "RSA/DSA public key"
-    method_option :key_path, :aliases => "-p", :desc => "Path to RSA/DSA public key"
-    # mozzn add_key
-    def add_key
-      mozzn = Mozzn::Api.new(Mozzn::Config.new.read['token'])
-      if options[:key_path].present?
-        key_path = File.expand_path(options[:key_path])
-      elsif options[:public_key].present?
-        public_key = options[:public_key]
-      else
-        raise Thor::Error, "Neither a key path or an SSH key were provided. You must use -p or -k options."
-      end
-
-      if public_key.nil?
-        if File.exist?(key_path)
-          File.open(key_path, "rb") do |f|
-            public_key = f.read
-          end
-        else
-          raise Thor::Error, "Unable to read #{key_path}. File does not exist or not accessible."
-        end
-      end
-
-      path = 'keys'
-      params = {
-        key: {
-          public: public_key
-        }
-      }
-      response = mozzn.post(path, params)
-      say response['info'], :green
-    rescue Mozzn::Disconnected
-      say 'Unable to connect to Mozzn check the internet connection!', :red
-    rescue Mozzn::UnexpectedOutput
-      say 'UnexpectedOutput', :red
-    end
-
-    desc 'create_app APPNAME', 'create a new application'
-    # mozzn create_app
-    def create_app name = nil
-      mozzn = Mozzn::Api.new(Mozzn::Config.new.read['token'])
-      if name == nil
-        raise Thor::Error, "You must enter application name."
-      end
-      path = 'applications'
-      params = {
-        application: {
-          name: name
-        }
-      }
-      response = mozzn.post(path, params)
-      say response['info'], :green
-      git = Git.init
-      unless File.exist?('.git')
-          git.add(all: true)
-        begin
-          git.commit('First commit')
-        rescue Git::GitExecuteError => e
-          # Do nothing
-        end
-      end
-      begin
-        git.add_remote("mozzn", "git@git.mozzn.com:#{name}.git")
-      rescue Git::GitExecuteError => e
-        say 'You already have this remote.', :red
-      end
-    rescue Mozzn::Disconnected
-      say 'Unable to connect to Mozzn check the internet connection!', :red
-    rescue Mozzn::UnexpectedOutput
-      say 'UnexpectedOutput'
-    end
-
-    desc 'remove_app APPNAME', 'Remove spcicfic Application.'
-
-    def remove_app name = nil
-      mozzn = Mozzn::Api.new(Mozzn::Config.new.read['token'])
-      if !name.present?
-        raise Thor::Error, "You must enter Application Name!"
-      end
-      params = {
-        name: name
-      }
-      search_path = "applications/search"
-      begin
-      response = mozzn.get(search_path, params)
-      if response.has_key?('info')
-        raise Thor::Error, "#{response['info']}"
-      else
-        id = response['app_id']
-        resources_path = "applications/#{id}/remove"
-        response = mozzn.get(resources_path,nil)
-        say response['info'], :green 
-      end  
-      rescue JSON::ParserError => e
-        raise Thor::Error,"You do not have an application with the name #{params[:name]}. Please check the application name."
-      end
-      rescue Mozzn::Disconnected
-      say 'Unable to connect to Mozzn. Check your internet connection!', :red
-      rescue Mozzn::UnexpectedOutput
-      say 'UnexpectedOutput', :red
-    end
-
-    desc 'update', 'To show if there is an update for the CLI'
+    desc 'update', 'Check for updates'
     def update
       # TODO after gem release https://rubygems.org/api/v1/versions/mozzn.json
       @connection = Faraday.new('https://rubygems.org/api/v1/versions/coulda.json')
@@ -169,164 +29,6 @@ module Mozzn
       end
     end
 
-    desc 'registration', 'Create an account on mozzn.'
-    method_option :name, :aliases => "-n", :desc => "Username."
-    method_option :email, :aliases => "-u", :desc => "User email used to login."
-    method_option :password, :aliases => "-p", :desc => "User password."
-    method_option :password_confirmation, :aliases => "-c", :desc => "Password_confirmation."
-    
-    def registration
-      mozzn = Mozzn::Api.new
-      if options.present?
-        name = options[:name] 
-        email = options[:email] 
-        password = options[:password] 
-        password_confirmation = options[:password_confirmation] 
-      else
-        h = HighLine.new
-        name = h.ask("Username: ")
-        email = h.ask("Email: ")
-        password = h.ask("Password: ")
-        password_confirmation = h.ask("password_confirmation: ")
-      end
-      params = {
-        user: {
-          name: name,
-          email: email,
-          password: password,
-          password_confirmation: password_confirmation
-        }
-      }
-      response = mozzn.post(:registrations, params)
-      errors = response['data']['errors']
-      if errors.present?
-        errors = JSON.parse(errors)
-        say "#{response['info']}, the following errors were found:\n * #{errors.map {|e| e.join(' ')}.join("\n * ")}\nPlease try again.", :red
-        # TODO: re-run registration
-      else
-        say response['info'], :green
-      end
-    end
-
-    desc 'resources appname', 'To list all instances which a specific application use.'
-    
-    def resources appname = nil
-      mozzn = Mozzn::Api.new(Mozzn::Config.new.read['token'])
-      if !appname.present?
-        raise Thor::Error, "You must enter Application Name!"
-      end
-      params = {
-        name: appname
-      }
-      search_path = "applications/search"
-      begin
-      response = mozzn.get(search_path, params)
-      if response.has_key?('info')
-        raise Thor::Error, "#{response['info']}"
-      else
-        id = response['app_id']
-        resources_path = "applications/#{id}/resources"
-        response = mozzn.get(resources_path,nil)
-        if response.has_key?('info')
-          raise Thor::Error, "#{response['info']}"
-        else
-          table1 = Terminal::Table.new(headings: ['Process', 'Command']) do |t|
-            response['resources'].each do |resource|
-              key = (resource.has_key?('command') ? resource['name'] : nil)
-              value = (resource.has_key?('command') ? resource['command'] : nil)
-              if key.present?
-                t.add_row [key, value]
-              end
-            end
-          end
-          table2 = Terminal::Table.new(headings: ['Database', 'Role']) do |t|
-            response['resources'].each do |resource|
-              key = (resource.has_key?('role') ? resource['name'] : nil)
-              value = (resource.has_key?('role') ? resource['role'] : nil)
-              if key.present?
-                t.add_row [key, value]
-              end
-            end
-          end
-        end
-        instances_path = "applications/#{id}/instances"
-        response = mozzn.get(instances_path,nil)
-        # say response['instances'].first['data']['ip_address'].inspect, :green
-        if response.has_key?('info')
-          raise Thor::Error, "#{response['info']}"
-        else
-          table3 = Terminal::Table.new(headings: ['Name', 'IP']) do |t|
-            response['instances'].each do |instant|
-              key = instant['data']['name']
-              value = instant['data']['ip_address']
-              if key.present?
-                t.add_row [key, value]
-              end
-            end
-          end
-        end
-        say "Processes:"
-        say "#{table1}"
-        say "Databases:"
-        say "#{table2}"
-        say "Instances:"
-        say "#{table3}"  
-      end
-
-      rescue JSON::ParserError => e
-        raise Thor::Error,"You do not have an application with the name #{params[:appname]}. Please check the application name."
-      end
-    rescue Mozzn::Disconnected
-      say 'Unable to connect to Mozzn. Check your internet connection!', :red
-    rescue Mozzn::UnexpectedOutput
-      say 'UnexpectedOutput', :red
-    end
-
-    desc 'console', 'To start a console on your first web server'
-    method_option :name, :aliases => "-c", :desc => "Command to be run in console."
-    def console 
-      config_file_path = ".git/config"
-      if File.exists?(config_file_path)
-        File.open(config_file_path, "r") do |f|
-          @data = f.read
-        end
-      else
-        raise Thor::Error,"Unable to find a repository for this directory. You probably not in the application directory or this application does not have git repository yet."
-      end
-       
-      url = @data.scan /url =.*/
-      app = url.first.split(":")[1] 
-      appname = app.split('.').first
-      mozzn = Mozzn::Api.new(Mozzn::Config.new.read['token'])
-      params = {
-        name: appname
-      }
-      search_path = "applications/search"
-      begin
-        response = mozzn.get(search_path, params)
-        if response.has_key?('info')
-          raise Thor::Error, "#{response['info']}"
-        else
-          id = response['app_id']
-          instances_path = "applications/#{id}/instances"
-          response = mozzn.get(instances_path,nil)
-          ip_address = response['instances'].first['data']['ip_address']
-          if options[:command].present?
-            system( "ssh app@#{ip_address} #{options[:command]}" )
-          else
-            system( "ssh app@#{ip_address}")
-          end
-          status = $?.exitstatus
-        end
-      rescue JSON::ParserError => e
-        raise Thor::Error,"You do not have an application with the name #{params[:name]}. Please check the application name."
-      end
-    rescue Mozzn::Disconnected
-      say 'Unable to connect to Mozzn. Check your internet connection!', :red
-    rescue Mozzn::UnexpectedOutput
-      say 'UnexpectedOutput', :red
-    end
-
     desc 'help COMMAND', 'For more infromation about spicific COMMAND'
     def help command = nil
       puts 'Primary help topics, type "mozzn help COMMAND" for more details.'
@@ -334,24 +36,13 @@ module Mozzn
       super command
     end
 
-    no_commands do
-      desc 'git_check', 'checks if user has git installed in $PATH or not'
-      def git_check
-        line = Cocaine::CommandLine.new("which git")
-        begin
-          output = line.run
-        rescue Cocaine::ExitStatusError => e
-          raise Thor::Error, 'Unable to find git it is either not installed or not in your $PATH. You may need to install it or add it to $PATH.' 
-        end
-      end
+    desc "key SUBCOMMAND", "Manage SSH keys"
+    subcommand "key", Mozzn::Commands::Key
 
-      desc 'ssh_key_check', 'checks if user has ssh key in ~/.ssh path'
-      def ssh_key_check
-        ssh = ['~/.ssh/id_rsa.pub','~/.ssh/id_dsa.pub']
-        unless ssh.map { |ssh| File.exist?(File.expand_path(ssh))} 
-          raise Thor::Error, "Unable to find an SSH key in #{File.expand_path('~/.ssh/')}. "
-        end
-      end
-    end
+    desc "app SUBCOMMAND", "Manage applications"
+    subcommand "app", Mozzn::Commands::App
+
+    desc "auth SUBCOMMAND", "Manage your accountUser registration and login"
+    subcommand "auth", Mozzn::Commands::Auth
   end  
 end

data/lib/mozzn/commands/app.rb

@@ -0,0 +1,222 @@
+module Mozzn
+  module Commands
+    class App < Thor
+
+      desc 'create APPNAME', 'create a new application'
+
+      def create name = nil
+        token = Mozzn::Config.new.read['token']
+        if token.nil?
+          raise Thor::Error,"You need to login in order to continue."
+        end
+        mozzn = Mozzn::Api.new(Mozzn::Config.new.read['token'])
+        if name == nil
+          raise Thor::Error, "You must enter application name."
+        end
+        path = 'applications'
+        params = {
+          application: {
+            name: name
+          }
+        }
+        response = mozzn.post(path, params)
+        if response.has_key?('message')
+          raise Thor::Error, "#{response['message']}"
+        else
+          say response['info'], :green
+          git = Git.init
+          unless File.exist?('.git')
+              git.add(all: true)
+            begin
+              git.commit('First commit')
+            rescue Git::GitExecuteError => e
+              # Do nothing
+            end
+          end
+          begin
+            git.add_remote("mozzn", "git@git.mozzn.com:#{name}.git")
+          rescue Git::GitExecuteError => e
+            say 'Git remote already configured, skipping...'
+          end
+        end
+      rescue Mozzn::Disconnected
+        say 'Unable to connect to Mozzn check the internet connection!', :red
+      rescue Mozzn::UnexpectedOutput
+        say 'UnexpectedOutput', :red
+      end
+
+      method_option :appname, :aliases => "-n", :desc => "Application name"
+      desc 'destroy ', 'Remove spcicfic Application'
+      def destroy 
+        token = Mozzn::Config.new.read['token']
+        if token.nil?
+          raise Thor::Error,"You need to login in order to continue."
+        end
+        mozzn = Mozzn::Api.new(Mozzn::Config.new.read['token'])
+        if options['appname'].present?
+          name = options['appname']
+        else
+          name = appname
+        end
+        params = {
+          name: name
+        }
+        search_path = "applications/search"
+        begin
+        response = mozzn.get(search_path, params)
+        if response.has_key?('info')
+          raise Thor::Error, "#{response['info']}"
+        else
+          id = response['app_id']
+          resources_path = "applications/#{id}/remove"
+          response = mozzn.get(resources_path,nil)
+          say response['info'], :green 
+        end  
+        rescue JSON::ParserError => e
+          raise Thor::Error,"You do not have an application with the name #{params[:name]}. Please check the application name."
+        end
+        rescue Mozzn::Disconnected
+        say 'Unable to connect to Mozzn. Check your internet connection!', :red
+        rescue Mozzn::UnexpectedOutput
+        say 'UnexpectedOutput', :red
+      end
+      desc "list", "List all your Applications."
+
+      def list
+      #TODO  
+      end
+
+      method_option :appname, :aliases => "-n", :desc => "Application name"
+      desc 'resources', 'To list all instances which application use'
+      def resources 
+        token = Mozzn::Config.new.read['token']
+        if token.nil?
+          raise Thor::Error,"You need to login in order to continue."
+        end
+        mozzn = Mozzn::Api.new(Mozzn::Config.new.read['token'])
+        if options['appname'].present?
+          name = options['appname']
+        else
+          name = appname
+        end
+        params = {
+          name: name
+        }
+        search_path = "applications/search"
+        begin
+        response = mozzn.get(search_path, params)
+        if response.has_key?('info')
+          raise Thor::Error, "#{response['info']}"
+        else
+          id = response['app_id']
+          resources_path = "applications/#{id}/resources"
+          response = mozzn.get(resources_path,nil)
+          if response.has_key?('info')
+            raise Thor::Error, "#{response['info']}"
+          else
+            table1 = Terminal::Table.new(headings: ['Process', 'Command']) do |t|
+              response['resources'].each do |resource|
+                key = (resource.has_key?('command') ? resource['name'] : nil)
+                value = (resource.has_key?('command') ? resource['command'] : nil)
+                if key.present?
+                  t.add_row [key, value]
+                end
+              end
+            end
+            table2 = Terminal::Table.new(headings: ['Database', 'Role']) do |t|
+              response['resources'].each do |resource|
+                key = (resource.has_key?('role') ? resource['name'] : nil)
+                value = (resource.has_key?('role') ? resource['role'] : nil)
+                if key.present?
+                  t.add_row [key, value]
+                end
+              end
+            end
+          end
+          instances_path = "applications/#{id}/instances"
+          response = mozzn.get(instances_path,nil)
+          if response.has_key?('info')
+            raise Thor::Error, "#{response['info']}"
+          else
+            table3 = Terminal::Table.new(headings: ['Name', 'IP']) do |t|
+              response['instances'].each do |instant|
+                key = instant['data']['name']
+                value = instant['data']['ip_address']
+                if key.present?
+                  t.add_row [key, value]
+                end
+              end
+            end
+          end
+          say "Processes:"
+          say "#{table1}"
+          say "Databases:"
+          say "#{table2}"
+          say "Instances:"
+          say "#{table3}"  
+        end
+
+        rescue JSON::ParserError => e
+          raise Thor::Error,"You do not have an application with the name #{params[:appname]}. Please check the application name."
+        end
+      rescue Mozzn::Disconnected
+        say 'Unable to connect to Mozzn. Check your internet connection!', :red
+      rescue Mozzn::UnexpectedOutput
+        say 'UnexpectedOutput', :red
+      end
+
+    desc 'console', 'To start a console on your first web server'
+    method_option :name, :aliases => "-c", :desc => "Command to be run in console."
+    def console 
+      token = Mozzn::Config.new.read['token']
+      if token.nil?
+        raise Thor::Error,"You need to login in order to continue."
+      end
+      mozzn = Mozzn::Api.new(Mozzn::Config.new.read['token'])
+      params = {
+        name: appname
+      }
+      search_path = "applications/search"
+      begin
+        response = mozzn.get(search_path, params)
+        if response.has_key?('info')
+          raise Thor::Error, "#{response['info']}"
+        else
+          id = response['app_id']
+          instances_path = "applications/#{id}/instances"
+          response = mozzn.get(instances_path,nil)
+          ip_address = response['instances'].first['data']['ip_address']
+          if options[:command].present?
+            system( "ssh app@#{ip_address} #{options[:command]}" )
+          else
+            system( "ssh app@#{ip_address}")
+          end
+          status = $?.exitstatus
+        end
+      rescue JSON::ParserError => e
+        raise Thor::Error,"You do not have an application with the name #{params[:name]}. Please check the application name."
+      end
+      rescue Mozzn::Disconnected
+        say 'Unable to connect to Mozzn. Check your internet connection!', :red
+      rescue Mozzn::UnexpectedOutput
+        say 'UnexpectedOutput', :red
+      end 
+      no_commands do
+        desc 'appname', 'Get application name'
+        def appname
+          config_file_path = ".git/config"
+          if File.exists?(config_file_path)
+            File.open(config_file_path, "r") do |f|
+              @data = f.read
+            end
+          else
+            raise Thor::Error,"Unable to find a repository for this directory. You probably not in the application directory or this application does not have git repository yet."
+          end
+          url = @data.scan /url =.*/
+          app = url.first.split(":")[1] 
+          appname = app.split('.').first
+        end
+      end
+    end
+  end
+end