picobox 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 402514d6b3f2e61a23162e553a374ebf16b2b858
-  data.tar.gz: 64e4e09effbadcb2ee9abd0fb7be6e05b0a60035
+  metadata.gz: b7b0e8e40c8ceeafa7cb79219419862956e7dbd9
+  data.tar.gz: 7635634d707c967cf388bb9aab972350035911bf
 SHA512:
-  metadata.gz: 31eb5aa3df0845d2f88c2e3d0e3a6d3e0f0ec4fcb8492e612659f8e5c3b2787cae10bdad6508252b1b67f4d3d87703dee3086d602276bde7150e9f704ce525e9
-  data.tar.gz: 2c5bbb347a212554698af4fa6d6d39c4e9f7765f058cca52c7ee2c7357583f60b99184fb4615aa9fdf026703b4c2aaf55a365bba68410941d70ccf48c1f290c3
+  metadata.gz: ff49aa4e1c0e249f33e4818ac7afe17e60db95700e098b58b7843875cb1b7b3838f413421fa08c7a5619210c18368350550ae216ab45906064aa74c881551d32
+  data.tar.gz: d7eb83c9c5c642be3389b8f8420b884974564b4db09c84a1a941365b1fa89099c1a09716e716d52c6259ffa71ae28cf815865d3f93eb99b5c40fa8eb40be74ed

data/lib/picobox/cli.rb

@@ -29,7 +29,7 @@ module Picobox
     LONGDESC
     def remove(service)
       Picobox.set_verbosity options[:verbose]
-      
+
       Service.new(Os::CurrentOs.get).remove service
     rescue SignalException
       exit 1
@@ -75,7 +75,9 @@ module Picobox
 
     desc 'version', 'displays current version'
     def version
-      say Picobox::VERSION
+      say "Picobox:  #{Picobox::VERSION}"
+      say "Packages: #{Picobox::Utils::Packages.new(Os::CurrentOs.get).installed_version[1..-1]}"
+
     rescue SignalException
       exit 1
     end

data/lib/picobox/commands/update_packages.rb

@@ -15,7 +15,7 @@ module Picobox
           system("mkdir  #{Picobox.packages_dir}")
           system("tar xvf #{filename} -C #{Picobox.packages_dir} --strip-components=1 #{Picobox.output}")
 
-          Shell::IniFile.get(os)[:packages] = { version: packages.version, last_update: Time.now.to_i }
+          Shell::IniFile.get(os)[:packages] = { version: packages.current_version, last_update: Time.now.to_i }
 
           publish_event :update_packages_stop
         end

data/lib/picobox/constants.rb

@@ -1,6 +1,6 @@
 module Picobox
   # names for files / directories
-  VERSION           = '0.3.0'
+  VERSION           = '0.3.1'
   HOMEPAGE          = 'https://github.com/surzycki/picobox'
   PACKAGES_INFO_URL = 'https://api.github.com/repos/picobox/packages/releases/latest'
   CONFIG_DIR        = '.picobox'

data/lib/picobox/utils/packages.rb

@@ -1,27 +1,25 @@
 module Picobox
   module Utils
     class Packages
-      def version() info['tag_name'] end
       def url()     info['tarball_url'] end
+      def current_version()   info['tag_name'] end
+      def installed_version() Picobox::Shell::IniFile.get(os)['packages']['version'] end
 
       def initialize(os)
         @os = os
       end
 
       def update?
-        installed_version = Picobox::Shell::IniFile.get(os)['packages']['version']
-        available_version = version
-
-        available_version > installed_version
+        current_version > installed_version
       end
 
       def download
         IO.copy_stream(
           open(url),
-          "#{os.tmp_dir}/packages_#{version}.tar"
+          "#{os.tmp_dir}/packages_#{current_version}.tar"
         )
 
-        "#{os.tmp_dir}/packages_#{version}.tar"
+        "#{os.tmp_dir}/packages_#{current_version}.tar"
       end
 
       private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: picobox
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Stefan Surzycki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-27 00:00:00.000000000 Z
+date: 2017-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug