rise-cli 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6441a8893f5b8526ec5e9cfb877b150249fcf90a
-  data.tar.gz: eef892f66d4561b8d8b226c7718d9f745ecb8531
+  metadata.gz: 45bf66600ed73d3196237da7baf820fc7f5d70b0
+  data.tar.gz: 829875b55c1c519238ce8a1cc11d094e9c5be679
 SHA512:
-  metadata.gz: cb77ea27f04538c80789df8ea02bde4d13dd788b5ba70b3bf8412c1c8ccdea363aa38e98e0844a63057feab9e4cfabd690eeef783b3165b1a096d5b2b329ef59
-  data.tar.gz: 63ce831369cc2d27681b6f90051d8b5edb305bffc71b49dfa5e923e76334e7ff91df5cadfc47deac7d143d7fa6d87fdd41eedcfcfc2cfe519e7949a9d8fd00e9
+  metadata.gz: 4eb1cfd3a0c32b6743f2fe5f641c44a29056ce3e747c9263cc45516f6eb5da15aca42b2bb6fb769c075699de0ef0d753ecb59e5e6c2d42306ab7ac538a3a26d0
+  data.tar.gz: 7b588ad2f036ac8f1db48fa8b534c9cfea6ad6e16991ceb1d5099f9b4f924c9c10c159ea3efa8b3935077d80c7c63ee1f9283d48d9f3d75cc7ed32c0bc0a1a61

data/lib/core/constants.rb

@@ -8,9 +8,10 @@ module Rise
   # Holds constants used throughout the framework
   #
   module Constants
-    VERSION = '0.1.9'.freeze
-    EMAIL   = '0xCB@protonmail.com'.freeze
-    AUTHORS = ['Carter Brainerd']
-    NAME    = 'rise-cli'.freeze
+    VERSION  = '0.2.0'.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/transport.rb

@@ -51,7 +51,7 @@ module Rise
         access_uri
       end
 
-      private
+      protected
 
       def calculate_files_size
         @files.inject(0){|sum, file| sum + File.size(file)}

data/lib/core/util.rb

@@ -4,9 +4,9 @@ require 'json'
 require 'http'
 require 'digest'
 require 'io/console'
-require 'tempfile'
 require 'whirly'
 require 'os'
+require 'json'
 require_relative 'constants'
 
 module Rise
@@ -25,34 +25,39 @@ module Rise
     # Check for a new version of the gem
     #
     def self.check_for_update!
-      output = ''
-      temp = Tempfile.new('rise-updater-output')
-      path = temp.path
-      system("gem outdated > #{path}")
-      output << temp.read
-      if output.include? 'rise-cli'
-        Whirly.start(
-          spinner: 'line',
-          status: Paint['New version available, updating...', 'blue']
-        ) do
-          system("gem uninstall rise-cli -v #{Rise::Constants::VERSION} > /dev/null")
-          system("gem install rise-cli > /dev/null")
-          puts Paint["Update complete, just run #{Paint['`rise`', '#3498db']} to deploy"]
+      src = 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 uninstall rise-cli -v #{Rise::Constants::VERSION} > /dev/null")
+              system("gem install rise-cli > /dev/null")
+              puts Paint["Update complete, just run #{Paint['`rise`', '#3498db']} to deploy"]
+            end
+          end
+        elsif src == 1
+          if `git log HEAD..origin/master --oneline` != ''
+            puts "It seems you're on bleeding edge, fetching new changes..."
+            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
         end
+      rescue StandardError => e
+        puts "Unable to check for updates. Error: #{Paint[e.message, 'red']}"
+        exit 1
       end
-    rescue StandardError => e
-      puts "Unable to check for updates. Error: #{Paint[e.message, 'red']}"
-      exit 1
-    ensure
-      temp.close
-      temp.unlink
     end
 
     #
     # Creates all of the necessary files and login information
     #
     def self.setup
-      puts Paint['Detected first time setup, creating necessary files...', :blue]
+      puts Paint['Detected first time run, creating necessary files...', :blue]
       FileUtils.mkdir(RISE_DATA_DIR)
       FileUtils.mkdir(File.join(RISE_DATA_DIR, 'auth'))
 
@@ -76,7 +81,7 @@ module Rise
     #
     # Opens +url+ in a web browser if possible
     #
-    def open_deployment_in_browser(url)
+    def self.open_deployment_in_browser(url)
       if OS.windows?
         system("START \"\" \"#{url}\"")
       else
@@ -84,5 +89,25 @@ module Rise
       end
     end
 
+
+
+    protected
+    #
+    # 1 = git, 2 = gem, 3 = unknown
+    #
+    def 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
+
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rise-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - Carter Brainerd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-19 00:00:00.000000000 Z
+date: 2017-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clipboard