silverball 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b9e6a4721e936e9764964f09257c59f5da628509
-  data.tar.gz: 394dd4af29993e7abb68da6964598809422679f3
+SHA256:
+  metadata.gz: b453aaaa0555be4950a7725f13dbe87f0f8a1ffbea3b530c9915cea953d32d24
+  data.tar.gz: 785143b6f9f9c52b006bc2b1d1fd118c62bddf057beec94fd3976b72868b5857
 SHA512:
-  metadata.gz: 7d902cb6c6caf729acf920ae9200df488bb4e28558b6bd8d6cc0bd9e39cd3ce2804524ce1d493c8f47764b2d7ad0bcc2d81b6a1ca39e36a7ffcc4211458f0cd6
-  data.tar.gz: 59b75702917c38b1c4f3405646083c6884279e6c63554b9f8dfa8000a32785533633b408225df55cbdc9c1a1815ab6e564a7231ea41ea965d2b5e1053188b9c9
+  metadata.gz: 32b1dbb88e9de3430bbc401016953e52fb71374e7f18f8ad836fb9405748b709fbe1523b1a35f78b7de084808813b90ccc460d7b787ce42a9ea4cf6bc794698f
+  data.tar.gz: 8fd182cfc7919f5b3d4fc4d5aafd7e337e1d88234cb2744c816fba46e08ef2b7b8995c975063808eb74f8762119ed18292325a570a37ece6513faee319de655b

data/.circleci/config.yml

@@ -0,0 +1,43 @@
+# Ruby CircleCI 2.0 configuration file
+#
+# Check https://circleci.com/docs/2.0/language-ruby/ for more details
+#
+version: 2
+jobs:
+  build:
+    docker:
+       - image: circleci/ruby:2.4.1
+
+    steps:
+      - checkout
+
+      - restore_cache:
+          keys:
+          - v1-dependencies-{{ checksum "silverball.gemspec" }}
+          # fallback to using the latest cache if no exact match is found
+          - v1-dependencies-
+
+      - run:
+          name: Install Dependencies
+          command: |
+            bundle install --jobs=4 --retry=3 --path vendor/bundle
+
+      - save_cache:
+          paths:
+            - ./vendor/bundle
+          key: v1-dependencies-{{ checksum "silverball.gemspec" }}
+
+      - run:
+          name: Run Tests
+          command: |
+            mkdir /tmp/test-results
+            bundle exec rspec --format RspecJunitFormatter \
+                              --out /tmp/test-results/rspec.xml \
+                              --format progress
+
+      - store_test_results:
+          path: /tmp/test-results
+
+      - store_artifacts:
+          path: /tmp/test-results
+          destination: test-results

data/.rspec

@@ -0,0 +1 @@
+--require spec_helper

data/CHANGELOG.md

@@ -19,6 +19,15 @@ glance - what to expact from upgrading to a new version.
 ### Removed
 
 
+## [0.1.3] - 2018-06-30
+
+### Fixed
+
+- Prevent `timespan_in_words`, when limited to one output unit, from returning
+  sub-unit timespans as '0'. This fixes eg `timespan_in_words(30, unit:
+  :minutes)` from returning '0m' instead of '0.5 min'.
+
+
 ## [0.1.2] - 2017-01-06
 
 ### Fixed

data/lib/silverball/date_time.rb

@@ -9,7 +9,7 @@ module Silverball
     def timespan_in_words(seconds, unit: nil, round: 2)
       seconds = seconds.to_f unless unit.nil?
 
-      if seconds >= SECONDS_PER_DAY && (unit.nil? || unit == :days)
+      if (seconds >= SECONDS_PER_DAY && unit.nil?) || unit == :days
         days = seconds / SECONDS_PER_DAY
         seconds -= days * SECONDS_PER_DAY
 
@@ -24,7 +24,7 @@ module Silverball
         days = 0
       end
 
-      if seconds >= SECONDS_PER_HOUR && (unit.nil? || unit == :hours)
+      if (seconds >= SECONDS_PER_HOUR && unit.nil?) || unit == :hours
         hours = seconds / SECONDS_PER_HOUR
         seconds -= hours * SECONDS_PER_HOUR
 
@@ -39,7 +39,7 @@ module Silverball
         hours = 0
       end
 
-      if seconds >= SECONDS_PER_MINUTE && (unit.nil? || unit == :minutes)
+      if (seconds >= SECONDS_PER_MINUTE && unit.nil?) || unit == :minutes
         minutes = seconds / SECONDS_PER_MINUTE
         seconds -= minutes * SECONDS_PER_MINUTE
 

data/silverball.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "silverball"
-  spec.version       = '0.1.2'
+  spec.version       = '0.1.3'
   spec.authors       = ["Michael Senn"]
   spec.email         = ["michael@morrolan.ch"]
 
@@ -19,8 +19,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.12"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 12.0"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "yard"
+  spec.add_development_dependency "rspec_junit_formatter", "~> 0.3"
+  spec.add_development_dependency "yard", "~> 0.9"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: silverball
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Michael Senn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-06 00:00:00.000000000 Z
+date: 2018-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -52,20 +52,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rspec_junit_formatter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: yard
   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:
 - michael@morrolan.ch
@@ -73,7 +87,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
+- ".rspec"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -106,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Various formatting for various things