rise-cli 0.2.7 → 0.2.8

data/bin/rise

@@ -1,112 +1,112 @@
-#!/usr/bin/env ruby
-
-require 'core'
-
-options = {}
-options[:open] = false
-options[:ignore_files] = nil
-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('-q', '--quiet', 'Run with very little output (only shows result URL)') do
-    options[:quiet] = true
-  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 (aliased by `update` task)') 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
-
-key = JSON.parse(File.read(File.join(RISE_DATA_DIR, 'auth', 'creds.json')))['hash']
-uploader = Rise::Transport::Uploader.new(dir, key, ignored)
-
-if uploader.total_files_size > 52428800
-  puts Paint["Max file size reached (#{uploader.total_files_size} > 50MB)", '#FF0000']
-  exit 0
-end
-
-if options[:quiet]
-  result_url = uploader.upload!
-  Clipboard.copy(result_url)
-  print Paint["Your url is: #{result_url} (copied to clipboard) ", :bold]
-  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! # 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
+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('-q', '--quiet', 'Run with very little output (only shows result URL)') do
+    options[:quiet] = true
+  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 (aliased by `update` task)') 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
+
+key = JSON.parse(File.read(File.join(RISE_DATA_DIR, 'auth', 'creds.json')))['hash']
+uploader = Rise::Transport::Uploader.new(dir, key, ignored)
+
+if uploader.total_files_size > 52428800
+  puts Paint["Max file size reached (#{uploader.total_files_size} > 50MB)", '#FF0000']
+  exit 0
+end
+
+if options[:quiet]
+  result_url = uploader.upload!
+  Clipboard.copy(result_url)
+  print Paint["Your url is: #{result_url} (copied to clipboard) ", :bold]
+  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! # 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.7'.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.8'.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,23 +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)
-
-#{Paint['Examples:', '#95a5a6']}
-    #{Paint['$ rise init --verbose', '#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
+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 --verbose', '#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,73 +1,75 @@
-require 'rex/text'
-require 'uri'
-require 'json'
-require 'http'
-require 'active_support'
-
-
-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, :key
-      attr_accessor :files
-
-      def initialize(folder_path, key, 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
-        @key              = key
-      end
-
-      # This makes a HTTP +PUT+ request on port 8080 to the /api/v1/ endpoint
-      # for each file in the selected folder.
-      #
-      # The body of the request is the contents of the file.
-      #
-      # The +Authorization+ request header is used for making the .keyfile on the serverside
-      # for the future file deletion method.
-      # @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.auth("#{key}").put(uri.to_s, body: ActiveSupport::Gzip.compress(File.read(f)))
-          rescue Errno::EISDIR
-            HTTP.auth("#{key}").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'
+require 'active_support'
+
+
+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, :key
+      attr_accessor :files
+
+      def initialize(folder_path, key, 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
+        @key              = key
+      end
+
+      # This makes a HTTP +PUT+ request on port 8080 to the /api/v1/ endpoint
+      # for each file in the selected folder.
+      #
+      # The body of the request is the contents of the file.
+      #
+      # The +Authorization+ request header is used for making the .keyfile on the serverside
+      # for the future file deletion method.
+      # @return String the final URL of the uploaded contents
+      #
+      def upload!
+        upload_uri_base = "http://rise.sh/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
+            res = HTTP.auth("#{key}").put(uri.to_s, body: ActiveSupport::Gzip.compress(File.read(f)))
+            abort(Paint["Upload failed. Got error code #{res.code} with message: #{JSON.parse(res)['message']}", :red]) unless (!res.code.nil? && res.code == 200)
+          rescue Errno::EISDIR
+            res = HTTP.auth("#{key}").put(uri.to_s, body: '')
+            abort(Paint["Upload failed. Got error code #{res.code} with message: #{JSON.parse(res)['message']}", :red]) unless (!res.code.nil? && res.code == 200)
+            next
+          end
+        end
+        access_uri
+      end
+
+      protected
+
+      def calculate_files_size
+        @files.inject(0){|sum, file| sum + File.size(file)}
+      end
+    end
+  end
+end