bario 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: fafa1b73da15e80e4b4c05fc625a090134939c62
-  data.tar.gz: cb21ca5c529072919e78dffa9d8d10494a30fb68
+SHA256:
+  metadata.gz: e4422efacaba8324f78fea7ae144ea17599bb071ff4f64417c2079cc9d6685bd
+  data.tar.gz: 76cf570ce91acc8515bd792c15f057c3e861bf06ce65db275daf19d4b9421839
 SHA512:
-  metadata.gz: 1ae76decfe7ca7fc18f97f08c31c8bbb3a1cc73195b3321b3daca3652a4f39be0d32e96257988c80f66f717deb4e142a190df24fc9b878e169de818e7cfb0192
-  data.tar.gz: 8d5253397711b402a7dd763a1aee1dd0fc0c81ac1c52f4d4cfc3fdb45556e680fe4df365d3780f0e852679c536e6e6a9712a5f2fb79a10f410d97f55044e6026
+  metadata.gz: e7b44652033ad8fe87c48608ab189ca0d0b87f3cdb5ac5d4a6767c57c3379983cd14318fb15e944efff482f22f4917e593739a7e2396a17f37e7a063fb40a80e
+  data.tar.gz: 1e10fe268c1d042be9bc92b2a31725d156f49cb7f7eb57c7e22cde8a2f0806bdba819186ab57bdb697e36729f25a6c2e2770f5f2ec1c17f6d0a67f701814a746

data/.rubocop.yml

@@ -2,7 +2,7 @@ require: rubocop-rspec
 
 AllCops:
   DisplayCopNames: true
-  TargetRubyVersion: 2.2
+  TargetRubyVersion: 2.6
 
 Style/StringLiterals:
   EnforcedStyle: double_quotes

data/.travis.yml

@@ -2,11 +2,9 @@ sudo: false
 language: ruby
 cache: bundler
 rvm:
-  - 2.2.8
-  - 2.3.5
-  - 2.4.2
-  - ruby-head
-  - jruby-head
+  - 2.5
+  - 2.6
+
 before_install: gem install bundler -v 1.16.0
 
 services:

data/README.md

@@ -1,6 +1,10 @@
 # Bario
 
 [![codecov](https://codecov.io/gh/ceritium/bario/branch/master/graph/badge.svg)](https://codecov.io/gh/ceritium/bario)
+[![Gem Version](https://badge.fury.io/rb/bario.svg)](https://badge.fury.io/rb/bario)
+[![Dependency Status](https://gemnasium.com/badges/github.com/ceritium/bario.svg)](https://gemnasium.com/github.com/ceritium/bario)
+[![Maintainability](https://api.codeclimate.com/v1/badges/37f2092deca467854301/maintainability)](https://codeclimate.com/github/ceritium/bario/maintainability)
+
 
 Bario means [Barium](https://en.wikipedia.org/wiki/Barium) in spanish.
 
@@ -9,6 +13,21 @@ Bario means [Barium](https://en.wikipedia.org/wiki/Barium) in spanish.
 This gem aim to provide a simple interface to track the progress of your process like background jobs, scripts, cron jobs... with a kind progress bars backed by redis.
 
 
+This gem still in very early state of development. Some behaviour could change in the future. 
+Ideas, pull requests and any kind of feedback are welcome.
+
+## Install
+
+```bash
+$ gem install bario
+```
+
+or add it to the Gemfile
+```ruby
+gem "bario"
+```
+
+
 ## Usage
 
 Examples:

data/bario.gemspec

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "bario/version"
 
@@ -18,19 +18,19 @@ Gem::Specification.new do |spec|
     f.match(%r{^(test|spec|features)/})
   end
   spec.bindir        = "bin"
-  spec.executables   = ["bario-demo", "bario-web"]
+  spec.executables   = %w[bario-demo bario-web]
   spec.require_paths = ["lib"]
 
   spec.add_dependency "ohm", "~> 3.0"
-  spec.add_dependency "sinatra"
-  spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "codecov"
+  spec.add_dependency "sinatra", "2.0.8.1"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "codecov", "~> 0.1"
   spec.add_development_dependency "guard-rspec", "~> 4.7"
   spec.add_development_dependency "guard-rubocop", "~> 1.0"
-  spec.add_development_dependency "rack-test"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rack-test", "~> 1.1"
+  spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rubocop", "~> 0.51"
   spec.add_development_dependency "rubocop-rspec", "~> 1.20"
-  spec.add_development_dependency "timecop"
+  spec.add_development_dependency "timecop", "~> 0.9"
 end

data/config.ru

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "camel_race/web"
 
 run CamelRace::Web

data/lib/bario/bar.rb

@@ -2,6 +2,8 @@
 
 require "forwardable"
 require "bario/inspector"
+require "bario/null_bar"
+require "bario/storage"
 
 module Bario
   # Bar encapsulate all the logic to create, list, find, delete and update
@@ -18,22 +20,27 @@ module Bario
 
     class << self
       def find(id)
-        bar = InternalBar[id]
+        bar = Storage[id]
         bar ? new(bar) : nil
       end
 
+      def get(id)
+        bar = Storage[id]
+        bar ? new(bar) : NullBar.new
+      end
+
       def all
-        collection(InternalBar.find(root: true))
+        collection(Storage.find(root: true))
       end
 
       def create(opts = {})
         opts[:total] ||= DEFAULT_TOTAL
         opts[:root] = true unless opts.key?(:root)
 
-        bar = InternalBar.create(opts)
+        bar = Storage.create(opts)
 
         parent = opts[:parent]
-        parent.children.push(bar) if parent
+        parent&.children&.push(bar)
         new(bar)
       end
 
@@ -96,61 +103,12 @@ module Bario
 
     def delete
       parent = bar.parent
-      parent.children.delete(bar) if parent
+      parent&.children&.delete(bar)
       bar.delete
     end
 
     private
 
     attr_reader :bar
-
-    # Internal storage backed in redis for bar
-    class InternalBar < Ohm::Model
-      attribute :name
-      index :name
-
-      attribute :root
-      index :root
-
-      attribute :total
-      attribute :current
-      counter :current
-
-      list :children, "Bario::Bar::InternalBar"
-      reference :parent, "Bario::Bar::InternalBar"
-
-      # Extracted from ohm-contrib
-      Timestamp = ->(time) { time && time.to_i.to_s }
-      attribute :created_at, Timestamp
-      attribute :updated_at, Timestamp
-
-      class << self
-        def time_now
-          Time.now.utc.to_i
-        end
-      end
-
-      def save
-        time_now = self.class.time_now
-
-        self.created_at = time_now if new?
-        self.updated_at = time_now
-        super
-      end
-
-      # Override increment update `updated_at` attribute
-      # `decrement` call to `increment`.
-      def increment(att, count = 1)
-        time_now = self.class.time_now
-
-        redis.queue("HINCRBY", key[:counters], att, count)
-        redis.queue("HSET", key, "updated_at", time_now)
-
-        self.updated_at = time_now
-        redis.commit
-      end
-    end
-
-    private_constant :InternalBar
   end
 end

data/lib/bario/null_bar.rb

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+require "bario/bar"
+
+module Bario
+  # Null version of Bar
+  class NullBar
+    def created_at
+      Time.now.utc
+    end
+
+    def updated_at
+      Time.now.utc
+    end
+
+    def name
+      ""
+    end
+
+    def root
+      false
+    end
+
+    def total
+      0
+    end
+
+    def current
+      0
+    end
+
+    def percent
+      0.0
+    end
+
+    def bars
+      []
+    end
+
+    def add_bar(_opts = {})
+      self.class.new
+    end
+
+    private
+
+    def method_missing(method, *args, &block)
+      if respond_to?(method)
+        nil
+      else
+        super
+      end
+    end
+
+    def respond_to_missing?(method_name, _include_private = false)
+      Bario::Bar.instance_methods.include?(method_name)
+    end
+  end
+end

data/lib/bario/storage.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module Bario
+  # Internal storage backed in redis for bar
+  class Storage < Ohm::Model
+    attribute :name
+    index :name
+
+    attribute :root
+    index :root
+
+    attribute :total
+    attribute :current
+    counter :current
+
+    list :children, "Bario::Storage"
+    reference :parent, "Bario::Storage"
+
+    # Extracted from ohm-contrib
+    Timestamp = ->(time) { time && time.to_i.to_s }
+    attribute :created_at, Timestamp
+    attribute :updated_at, Timestamp
+
+    class << self
+      def time_now
+        Time.now.utc.to_i
+      end
+    end
+
+    def save
+      time_now = self.class.time_now
+
+      self.created_at = time_now if new?
+      self.updated_at = time_now
+      super
+    end
+
+    # Override increment update `updated_at` attribute
+    # `decrement` call to `increment`.
+    def increment(att, count = 1)
+      time_now = self.class.time_now
+
+      redis.queue("HINCRBY", key[:counters], att, count)
+      redis.queue("HSET", key, "updated_at", time_now)
+
+      self.updated_at = time_now
+      redis.commit
+    end
+  end
+end

data/lib/bario/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bario
-  VERSION = "0.1.0".freeze
+  VERSION = "0.1.1"
 end

data/lib/bario/web.rb

@@ -52,7 +52,7 @@ module Bario
 
     post "/bars-delete/:id" do
       bar = Bario::Bar.find(params[:id])
-      bar.delete if bar
+      bar&.delete
       redirect to("/")
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bario
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Jose Galisteo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-26 00:00:00.000000000 Z
+date: 2020-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ohm
@@ -28,44 +28,44 @@ dependencies:
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.8.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: codecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -98,30 +98,30 @@ dependencies:
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -168,16 +168,16 @@ dependencies:
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
 description: 
 email:
 - ceritium@gmail.com
@@ -207,6 +207,8 @@ files:
 - lib/bario/bar.rb
 - lib/bario/cli.rb
 - lib/bario/inspector.rb
+- lib/bario/null_bar.rb
+- lib/bario/storage.rb
 - lib/bario/version.rb
 - lib/bario/web.rb
 - lib/bario/web/public/robots.txt
@@ -234,8 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Redis based nested progress bars