rise-cli 0.2.5 → 0.2.6

data/bin/rise

@@ -1,102 +1,101 @@
-#!/usr/bin/env ruby
-$LOAD_PATH.unshift(File.expand_path(File.join('..', 'lib'))) unless $LOAD_PATH.include?(File.expand_path(File.join('..', 'lib')))
-
-require 'core'
-
-options = {}
-options[:open] = false
-options[:ignore_files] = nil
-# TODO: convert the tasks to use thor or Rex::Parser::Arguments from 'rex'
-OptionParser.new do |opts|
-  opts.banner = "Usage: #{$PROGRAM_NAME} [options]\nRise version: #{Rise::Constants::VERSION}"
-  opts.separator Paint["\nGeneral Options: ", '#95a5a6']
-
-  opts.on('-d DIR', '--dir DIR', String, 'Upload files in DIR (Defaults to the current directory)') do |d|
-    options[:directory] = d unless d.nil?
-  end
-
-  opts.on('-v', '--version', 'Show the rise version and exit') do
-    puts "Rise version: #{Paint[Rise::Constants::VERSION, '#2ecc71']}"
-    exit 0
-  end
-
-  opts.on('--verbose', 'Run verbosely') do |v|
-    ENV['RISE_VERBOSE'] = 'yes'
-  end
-
-  opts.on('-i', '--ignore FILES', Array, 'Ignore the given files in the upload. These will be ignored if there is a .riseignore file.') do |a|
-    options[:ignored_files] = a unless a.nil?
-    puts "Reminder: You can add the files to .riseignore instead of using the -i flag"
-  end
-
-  opts.on('-o', '--open', 'Open the deployment in a browser if possible') do
-    options[:open] = true
-  end
-
-  opts.on('-u', '--update', 'Check if rise has a newer version and install it') do
-    Rise::Util.check_for_update!
-    exit 0
-  end
-
-  opts.on('-h', '--help', 'Show this help message') do
-    puts opts
-    puts Rise::Text::TASKS_HELP
-    exit
-  end
-
-  opts.separator Paint["\nTasks: ", '#95a5a6']
-
-end.parse!(ARGV)
-
-# Ladies and gentlemen, this is what
-# happens when optparse doesn't have
-# good subcommand/task syntax support
-while opt = ARGV.shift do
-  case opt
-  when 'init'
-    Rise::Util.setup(false)
-    exit 0
-  when 'update'
-    Rise::Util.check_for_update!
-    exit 0
-  end
-end
-
-
-if Rise::Util.first_run?
-  Rise::Util.setup
-  exit 0
-end
-Rise::Util.check_for_update!
-dir = options[:directory] || Dir.pwd
-ignored = nil
-result_url = ''
-
-begin
-  ignored = File.read(File.join(dir, '.riseignore')).split("\n").map { |a| a.gsub!(' ', '')}
-rescue Errno::ENOENT
-  ignored = options[:ignored_files]
-end
-
-uploader = Rise::Transport::Uploader.new(dir, ignored)
-
-if uploader.total_files_size > 52428800
-  puts Paint["Max file size reached (#{uploader.total_files_size} > 50MB)", '#FF0000']
-  exit 0
-end
-
-puts Paint['Thanks for using Rise! Your local source for serverless deployment!', '#95a5a6']
-
-Whirly.start(spinner: 'dots', status: "Uploading files (#{uploader.total_files} total files)") do
-  beginning_time = Time.now
-  result_url = uploader.upload!(options[:verbose]) # Do the file upload
-
-  Whirly.status = "Done!\n"
-  Clipboard.copy(result_url)
-  print Paint["Your url is: #{result_url} (copied to clipboard) ", :bold]
-  puts Paint["[#{((Time.now - beginning_time)).round(2)}s]", '#95a5a6']
-
-  puts Paint['Deployment successful!', '#3498db']
-
-  Rise::Util.open_deployment_in_browser(result_url) if options[:open]
-end
+#!/usr/bin/env ruby
+
+require 'core'
+
+options = {}
+options[:open] = false
+options[:ignore_files] = nil
+# TODO: convert the tasks to use thor or Rex::Parser::Arguments from 'rex'
+OptionParser.new do |opts|
+  opts.banner = "\nUsage: #{File.basename($PROGRAM_NAME)} [options] [task]\nRise version: #{Rise::Constants::VERSION}"
+  opts.separator Paint["\nGlobal Options: ", '#95a5a6']
+
+  opts.on('-d DIR', '--dir DIR', String, 'Upload files in DIR (Defaults to the current directory)') do |d|
+    options[:directory] = d unless d.nil?
+  end
+
+  opts.on('-v', '--version', 'Show the rise version and exit') do
+    puts "Rise version: #{Paint[Rise::Constants::VERSION, '#2ecc71']}"
+    exit 0
+  end
+
+  opts.on('--verbose', 'Run verbosely') do
+    ENV['RISE_VERBOSE'] = 'yes'
+  end
+
+  opts.on('-i', '--ignore FILES', Array, 'Ignore the given files in the upload. These will be ignored if there is a .riseignore file.') do |a|
+    options[:ignored_files] = a unless a.nil?
+    puts "Reminder: You can add the files to .riseignore instead of using the -i flag"
+  end
+
+  opts.on('-o', '--open', 'Open the deployment in a browser if possible') do
+    options[:open] = true
+  end
+
+  opts.on('-u', '--update', 'Check if rise has a newer version and install it') do
+    Rise::Util.check_for_update!
+    exit 0
+  end
+
+  opts.on('-h', '--help', 'Show this help message') do
+    puts opts
+    puts Rise::Text::TASKS_HELP
+    exit
+  end
+
+  opts.separator Paint["\nTasks: ", '#95a5a6']
+
+end.parse!(ARGV)
+
+# Ladies and gentlemen, this is what
+# happens when optparse doesn't have
+# good subcommand/task syntax support
+while (opt = ARGV.shift) do
+  case opt
+  when 'init'
+    Rise::Util.setup(false)
+    exit 0
+  when 'update'
+    Rise::Util.check_for_update!
+    exit 0
+  end
+end
+
+
+if Rise::Util.first_run?
+  Rise::Util.setup
+  exit 0
+end
+Rise::Util.check_for_update!
+dir = options[:directory] || Dir.pwd
+ignored = nil
+result_url = ''
+
+begin
+  ignored = File.read(File.join(dir, '.riseignore')).split("\n").map { |a| a.gsub!(' ', '')}
+rescue Errno::ENOENT
+  ignored = options[:ignored_files]
+end
+
+uploader = Rise::Transport::Uploader.new(dir, ignored)
+
+if uploader.total_files_size > 52428800
+  puts Paint["Max file size reached (#{uploader.total_files_size} > 50MB)", '#FF0000']
+  exit 0
+end
+
+puts Paint['Thanks for using Rise! Your local source for serverless deployment!', '#95a5a6']
+
+Whirly.start(spinner: 'dots', status: "Uploading files (#{uploader.total_files} total files)") do
+  beginning_time = Time.now
+  result_url = uploader.upload!(options[:verbose]) # Do the file upload
+
+  Whirly.status = "Done!\n"
+  Clipboard.copy(result_url)
+  print Paint["Your url is: #{result_url} (copied to clipboard) ", :bold]
+  puts Paint["[#{((Time.now - beginning_time)).round(2)}s]", '#95a5a6']
+
+  puts Paint['Deployment successful!', '#3498db']
+
+  Rise::Util.open_deployment_in_browser(result_url) if options[:open]
+end

data/lib/core/constants.rb

@@ -1,17 +1,17 @@
-RISE_DATA_DIR = File.join(Dir.home, '.rise')
-DOMAIN        = 'rise.sh'.freeze
-AUTH_PORT     = 4567
-UPLOAD_PORT   = 8080
-
-module Rise
-  #
-  # Holds constants used throughout the framework
-  #
-  module Constants
-    VERSION  = '0.2.5'.freeze
-    EMAIL    = '0xCB@protonmail.com'.freeze
-    AUTHORS  = ['Carter Brainerd']
-    NAME     = 'rise-cli'.freeze
-    RISE_DIR = File.join(File.dirname(__FILE__), '..', '..')
-  end
-end
+RISE_DATA_DIR = File.join(Dir.home, '.rise')
+DOMAIN        = 'rise.sh'.freeze
+AUTH_PORT     = 4567
+UPLOAD_PORT   = 8080
+
+module Rise
+  #
+  # Holds constants used throughout the framework
+  #
+  module Constants
+    VERSION  = '0.2.6'.freeze
+    EMAIL    = '0xCB@protonmail.com'.freeze
+    AUTHORS  = ['Carter Brainerd']
+    NAME     = 'rise-cli'.freeze
+    RISE_DIR = File.join(File.dirname(__FILE__), '..', '..')
+  end
+end

data/lib/core/text.rb

@@ -1,24 +1,23 @@
-require 'paint'
-#
-# Text and printing utility methods
-#
-module Rise
-  module Text
-
-    TASKS_HELP =
-    %Q{    init                             Reinitialize your password hash. (You will lose you old hash FOREVER)
-    update                           Updates the current rise-cli installation (aliased by -u)
-
-Examples:
-    #{Paint['$ rise init -v', '#2ecc71']}                    Reinitializes your password with verbose output
-    #{Paint['$ rise -d ../my-project -o', '#2ecc71']}        Will upload all files in `../my-project` and open it in a browser
-    }
-
-    #
-    # Prints +msg+ if the +RISE_VERBOSE+ environment variable is true (set with --verbose)
-    #
-    def self.vputs(msg='')
-      puts msg if ENV['RISE_VERBOSE'] == 'yes'
-    end
-  end
-end
+require 'paint'
+#
+# Text and printing utility methods
+#
+module Rise
+  module Text
+    TASKS_HELP =
+    %Q{    init                             Reinitialize your password hash. (You will lose you old hash FOREVER)
+    update                           Updates the current rise-cli installation (aliased by -u)
+
+#{Paint['Examples:', '#95a5a6']}
+    #{Paint['$ rise init -v', '#2ecc71']}                    Reinitializes your password with verbose output
+    #{Paint['$ rise -d ../my-project -o', '#2ecc71']}        Will upload all files in `../my-project` and open it in a browser
+    }
+
+    #
+    # Prints +msg+ if the +RISE_VERBOSE+ environment variable is set to 'yes' (set with --verbose)
+    #
+    def self.vputs(msg='')
+      puts msg if ENV['RISE_VERBOSE'] == 'yes'
+    end
+  end
+end

data/lib/core/transport.rb

@@ -1,65 +1,65 @@
-require 'rex/text'
-require 'uri'
-require 'json'
-require 'http'
-
-module Rise
-  #
-  # Handles all communication with the rise upload server
-  #
-  module Transport
-    # Handles uploading files
-    class Uploader
-      attr_reader :folder_path, :total_files, :include_folder
-      attr_reader :uuid, :current_file, :total_files_size
-      attr_accessor :files
-
-      def initialize(folder_path, excluded_files = [], include_folder = true)
-        excluded_files.map! do |a|
-          File.join(File.absolute_path(folder_path), a)
-        end unless excluded_files.nil?
-        @folder_path      = folder_path
-        @files            = Dir.glob("#{File.absolute_path(folder_path)}/**/*")
-        @files           -= excluded_files unless excluded_files.nil?
-        @total_files      = @files.length
-        @total_files_size = calculate_files_size
-        @include_folder   = include_folder
-        @uuid             = "#{File.basename(File.absolute_path(folder_path)).gsub('_', '-')}-#{Rex::Text.rand_text_alphanumeric(8)}" # Structure: foldername-8RNDLTRS
-      end
-
-      #
-      # Uploads the files from +folder_path+ to the upload server
-      # @return String the final URL of the uploaded contents
-      #
-      def upload!(*)
-        upload_uri_base = "http://rise.sh:8080/api/v1/#{@uuid}"
-        access_uri = "https://rise.sh/#{@uuid}"
-        uri = ''
-
-        # This sorts the files by (file path) length.
-        # It is supposed to make the server make the first layer of files
-        # before the rest of the layers.
-        ordered_files = files.sort_by(&:length)
-        ordered_files.each do |f|
-          isdir = File.directory?(f)
-          final_path = File.absolute_path(f).gsub(
-            File.expand_path(folder_path), '')
-          uri = URI.parse("#{upload_uri_base}/#{final_path.gsub(' ', '')}?dir=#{isdir}")
-          begin
-            HTTP.put(uri.to_s, body: File.read(f))
-          rescue Errno::EISDIR
-            HTTP.put(uri.to_s, body: '')
-            next
-          end
-        end
-        access_uri
-      end
-
-      protected
-
-      def calculate_files_size
-        @files.inject(0){|sum, file| sum + File.size(file)}
-      end
-    end
-  end
-end
+require 'rex/text'
+require 'uri'
+require 'json'
+require 'http'
+
+module Rise
+  #
+  # Handles all communication with the rise upload server
+  #
+  module Transport
+    # Handles uploading files
+    class Uploader
+      attr_reader :folder_path, :total_files, :include_folder
+      attr_reader :uuid, :current_file, :total_files_size
+      attr_accessor :files
+
+      def initialize(folder_path, excluded_files = [], include_folder = true)
+        excluded_files.map! do |a|
+          File.join(File.absolute_path(folder_path), a)
+        end unless excluded_files.nil?
+        @folder_path      = folder_path
+        @files            = Dir.glob("#{File.absolute_path(folder_path)}/**/*")
+        @files           -= excluded_files unless excluded_files.nil?
+        @total_files      = @files.length
+        @total_files_size = calculate_files_size
+        @include_folder   = include_folder
+        @uuid             = "#{File.basename(File.absolute_path(folder_path)).gsub('_', '-')}-#{Rex::Text.rand_text_alphanumeric(8)}" # Structure: foldername-8RNDLTRS
+      end
+
+      #
+      # Uploads the files from +folder_path+ to the upload server
+      # @return String the final URL of the uploaded contents
+      #
+      def upload!(*)
+        upload_uri_base = "http://rise.sh:8080/api/v1/#{@uuid}"
+        access_uri = "https://rise.sh/#{@uuid}"
+        uri = ''
+
+        # This sorts the files by (file path) length.
+        # It is supposed to make the server make the first layer of files
+        # before the rest of the layers.
+        ordered_files = files.sort_by(&:length)
+        ordered_files.each do |f|
+          isdir = File.directory?(f)
+          final_path = File.absolute_path(f).gsub(
+            File.expand_path(folder_path), '')
+          uri = URI.parse("#{upload_uri_base}/#{final_path.gsub(' ', '')}?dir=#{isdir}")
+          begin
+            HTTP.put(uri.to_s, body: File.read(f))
+          rescue Errno::EISDIR
+            HTTP.put(uri.to_s, body: '')
+            next
+          end
+        end
+        access_uri
+      end
+
+      protected
+
+      def calculate_files_size
+        @files.inject(0){|sum, file| sum + File.size(file)}
+      end
+    end
+  end
+end

data/lib/core/util.rb

@@ -1,112 +1,115 @@
-require 'fileutils'
-require 'paint'
-require 'json'
-require 'http'
-require 'bcrypt'
-require 'io/console'
-require 'whirly'
-require 'os'
-require 'json'
-require_relative 'constants'
-
-module Rise
-  #
-  # Utility methods
-  #
-  module Util
-    #
-    # Checks if rise is being run for the first time
-    #
-    def self.first_run?
-      !File.directory?(File.join(Dir.home, '.rise'))
-    end
-
-    #
-    # 1 = git, 2 = gem, 3 = unknown
-    #
-    def self.git_or_gem
-      gem = nil
-      1 if File.exist?(File.join(Rise::Constants::VERSION, '.git'))
-      if OS.windows?
-        gem = system('which gem > NUL')
-      else
-        gem = system('which gem > /dev/null')
-      end
-
-      2 if gem == true
-      3
-    end
-
-    #
-    # Check for a new version of the gem
-    #
-    def self.check_for_update!
-      src = Rise::Util.git_or_gem
-      begin
-        if src == 2  # if the gem was downloaded from rubygems
-          current_version = JSON.parse(HTTP.get('https://rubygems.org/api/v1/versions/rise-cli/latest.json'))['version']
-          if current_version != Rise::Constants::VERSION
-            Whirly.start(
-              spinner: 'line',
-              status: "New version available (#{Paint[Rise::Constants::VERSION, 'red']} -> #{Paint[current_version, '#3498db']}), updating..."
-            ) do
-              system("gem install rise-cli")
-              puts Paint["Update complete, just run #{Paint['`rise`', '#3498db']} to deploy"]
-            end
-          end
-        elsif src == 1
-          puts "It seems you're on bleeding edge, fetching new changes..."
-          Rise::Text.vputs("Updating from #{`git show --no-color --oneline -s`.split(' ')[0]} to #{`git rev-parse --short HEAD`}")
-          `git pull`
-          puts Paint["Update complete, just run #{Paint['`rise`', '#3498db']} to deploy"]
-        end
-      rescue StandardError => e
-        puts "Unable to check for updates. Error: #{Paint[e.message, 'red']}"
-        exit 1
-      end
-    end
-
-    #
-    # Creates all of the necessary files and login information
-    #
-    def self.setup(first = true)
-      if first
-        puts Paint['Detected first time setup, creating necessary files...', :blue]
-        FileUtils.mkdir(RISE_DATA_DIR)
-        FileUtils.mkdir(File.join(RISE_DATA_DIR, 'auth'))
-      end
-
-      puts Paint['Create a password to secure your uploads.', :bold]
-      pw = Rise::Util.signup
-      while true
-        break if pw.length > 8
-        puts Paint['Password not long enough,
-          it has to be longer than 8 characters', :red]
-          pw = Rise::Util.signup
-      end
-      File.open(File.join(RISE_DATA_DIR, 'auth', 'creds.json'), 'w') do |f|
-        Rise::Text.vputs('Writing hash to creds.json...')
-        creds_hash = { 'hash' => BCrypt::Password.create(pw) }
-        f.puts(JSON.pretty_generate(creds_hash))
-      end
-      puts "\nAll done!\nPlease run the `rise` command again to upload your files."
-    end
-
-    def self.signup
-      print 'Password: '
-      STDIN.noecho(&:gets).chomp
-    end
-
-    #
-    # Opens +url+ in a web browser if possible
-    #
-    def self.open_deployment_in_browser(url)
-      if OS.windows?
-        system("START \"\" \"#{url}\"")
-      else
-        system("open #{url}")
-      end
-    end
-
-  end
-end
+require 'fileutils'
+require 'paint'
+require 'json'
+require 'http'
+require 'bcrypt'
+require 'io/console'
+require 'whirly'
+require 'os'
+require 'json'
+require_relative 'constants'
+
+module Rise
+  #
+  # Utility methods
+  #
+  module Util
+    #
+    # Checks if rise is being run for the first time
+    #
+    def self.first_run?
+      !File.directory?(File.join(Dir.home, '.rise'))
+    end
+
+    #
+    # 1 = git, 2 = gem, 3 = unknown
+    #
+    def self.git_or_gem?
+      gem = nil
+      return 1 if File.exist?(File.join(Rise::Constants::RISE_DIR, '.git'))
+      if OS.windows?
+        gem = system('which gem > NUL')
+      else
+        gem = system('which gem > /dev/null')
+      end
+      return 2 if gem
+      3
+    end
+
+    #
+    # Check for a new version of the gem
+    #
+    def self.check_for_update!
+      src = Rise::Util.git_or_gem?
+      Rise::Text.vputs("Source: #{src}")
+      begin
+        if src == 2  # if the gem was downloaded from rubygems
+          current_version = JSON.parse(HTTP.get('https://rubygems.org/api/v1/versions/rise-cli/latest.json'))['version']
+
+          current_version_i = current_version.gsub('.', '').to_i
+          puts "#{current_version_i} #{Rise::Constants::VERSION.gsub('.', '').to_i}"
+
+          if current_version_i > Rise::Constants::VERSION.gsub('.', '').to_i
+            Whirly.start(
+              spinner: 'line',
+              status: "New version available (#{Paint[Rise::Constants::VERSION, 'red']} -> #{Paint[current_version, '#3498db']}), updating..."
+            ) do
+              system("gem install rise-cli")
+              puts Paint["Update complete, just run #{Paint['`rise`', '#3498db']} to deploy"]
+            end
+          end
+        elsif src == 1
+          Rise::Text.vputs("It seems you're on bleeding edge, fetching new changes...")
+          Rise::Text.vputs("Updating from #{`git show --no-color --oneline -s`.split(' ')[0]} to #{`git rev-parse --short HEAD`}")
+          `git pull`
+          puts Paint["Update complete, just run #{Paint['`rise`', '#3498db']} to deploy"]
+        end
+      rescue StandardError => e
+        puts "Unable to check for updates. Error: #{Paint[e.message, 'red']}"
+        exit 1
+      end
+    end
+
+    #
+    # Creates all of the necessary files and login information
+    #
+    def self.setup(first = true)
+      if first
+        puts Paint['Detected first time setup, creating necessary files...', :blue]
+        FileUtils.mkdir(RISE_DATA_DIR)
+        FileUtils.mkdir(File.join(RISE_DATA_DIR, 'auth'))
+      end
+
+      puts Paint['Create a password to secure your uploads.', :bold]
+      pw = Rise::Util.signup
+      while pw.length < 8
+        puts Paint["Password not long enough,
+          it has to be longer than 8 characters\n", :red]
+          pw = Rise::Util.signup
+      end
+      File.open(File.join(RISE_DATA_DIR, 'auth', 'creds.json'), 'w') do |f|
+        Rise::Text.vputs("\nWriting hash to creds.json...")
+        creds_hash = { 'hash' => BCrypt::Password.create(pw) }
+        f.puts(JSON.pretty_generate(creds_hash))
+      end
+      puts "\nAll done!\nRun #{Paint['`rise`', '#3498db']} to deploy"
+    end
+
+    def self.signup
+      print 'Password: '
+      STDIN.noecho(&:gets).chomp
+    end
+
+    #
+    # Opens +url+ in a web browser if possible
+    #
+    def self.open_deployment_in_browser(url)
+      if OS.windows?
+        system("START \"\" \"#{url}\"")
+      else
+        system("open #{url}")
+      end
+    end
+
+  end
+end