velibe 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1171c7eb99d496a8fe7098cd4bac0e55afc5d433
-  data.tar.gz: f297507d830b9ced6865fd86c208ac0478fb323f
+  metadata.gz: 53bf1830ce882ba66e706edbf383b5c97f0a3fa8
+  data.tar.gz: 22d9f6e371bf02de9e399f7f72797acff029aa07
 SHA512:
-  metadata.gz: 0c0ff73de3c30a96c1469c61871fc076fd70e6d7c21e4d4ac4305ffce471809d40436c55f1d19861805c0db5e251794afdddd0a0cfc7b63194a954f747a177e6
-  data.tar.gz: a8e0c19d9df1ba889f7d68e1089d5c990cc6cade8183db671f42a7c0740642363cc1d2a0c3b41ac29e654ec96b040ad6f636979bf71f6e8b92d05ac4ebbc4803
+  metadata.gz: 881572db58c41d7c2ff371781661b743f1498005718dce68d0f7ddff0474105692f8c664679ea2a8841174fa2f54c7ebf5a345ec312c88cdb85f9b04a528531c
+  data.tar.gz: 214b62a2c0ace61ec874eb8b0cc1492a08c99894fcfab161c6dfad811745eefdb1cfb0f03a74d9107accf21b1734084b8fa0b3b42751a1a8b7b460f8ee6812bf

data/.travis.yml

@@ -10,7 +10,6 @@ rvm:
 before_install: gem install bundler
 install: bundle install
 script:
-  - export VELIBE_TOKEN="junk"
   - bundle exec rake spec
 
 matrix:

data/CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to *Velibe* will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased][unreleased]
+## [0.2.3] - 2015-12-04
+### Fixed
+- ensure favorites stations are stored as integer
+- prevent running test to destroy your config :)
 
 ## [0.2.2] - 2015-12-02
 ### Fixed
@@ -38,7 +42,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ## [0.0.1] - 2015-07-04
 - Initial Release
 
-[unreleased]: https://github.com/AdrieanKhisbe/velibe/compare/v0.2.1...HEAD
+[unreleased]: https://github.com/AdrieanKhisbe/velibe/compare/v0.2.3...HEAD
+[0.2.3]: https://github.com/AdrieanKhisbe/velibe/compare/v0.2.2...v0.2.3
+[0.2.2]: https://github.com/AdrieanKhisbe/velibe/compare/v0.2.1...v0.2.2
 [0.2.1]: https://github.com/AdrieanKhisbe/velibe/compare/v0.2.0...v0.2.1
 [0.2.0]: https://github.com/AdrieanKhisbe/velibe/compare/v0.1.0...v0.2.0
 [0.1.0]: https://github.com/AdrieanKhisbe/velibe/compare/v0.0.2...v0.1.0

data/Rakefile

@@ -1,8 +1,19 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-# §todo: see task offered
+# coding: utf-8
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+require 'cucumber'
+require 'cucumber/rake/task'
+
+# §todo: see task offered : -T flag
 # see -> http://pablocantero.com/blog/2011/01/02/new-gem-with-bundler-sample-rakefile/
 
 RSpec::Core::RakeTask.new(:spec)
+Cucumber::Rake::Task.new(:features) do |t|
+  t.cucumber_opts = 'features --format pretty'
+end
+
+task test: [:spec, :features]
+task default: :test
+
+
 
-task :default => :spec

data/features/step_definitions/config_steps.rb

@@ -0,0 +1,5 @@
+
+
+Given(/^my favorites stations are ([\d, ]+)$/) do |pattern|
+  Velibe::KvStore.reset_favorite_stations *pattern.split(', ')
+end

data/features/support/aruba.rb

@@ -0,0 +1 @@
+require 'aruba/cucumber'

data/features/support/env.rb

@@ -0,0 +1,26 @@
+require 'aruba/cucumber'
+velibe_lib = File.expand_path('../../lib', __FILE__)
+
+ENV['VELIBE_DB_PATH'] = '/tmp/velibe.db'
+ENV['VELIBE_CONFIG_PATH'] = '/tmp/velibe.yaml'
+ENV['VELIBE_TOKEN'] = 'fake-test-value'
+
+if ENV['TRAVIS']
+  require 'simplecov'
+  require 'coveralls'
+
+  SimpleCov.formatter = Coveralls::SimpleCov::Formatter
+  SimpleCov.start do
+    # No need to report coverage metrics for the test code
+    add_filter 'test'
+    add_filter 'features'
+    add_filter 'data'
+  end
+
+  # Eager load the entire lib directory so that SimpleCov is able to report
+  # accurate code coverage metrics.
+  at_exit { Dir["#{velibe_lib}/**/*.rb"].each { |rb| require(rb) } }
+end
+
+$LOAD_PATH.unshift velibe_lib
+require 'velibe'

data/features/velibe_favorites.feature

@@ -0,0 +1,16 @@
+Feature: Playing with favorites
+  In order to see not specify each time wich station i'm interested in
+  As a user of the velibe cli
+  I want to be handle to manage favorite
+
+
+Background: Favorites Exists
+  Given my favorites stations are 22, 42, 68
+
+Scenario: List favorites
+
+Scenario: Add a Favorite
+
+
+
+Scenario: Force Reset of favorites

data/features/velibe_query.feature

@@ -0,0 +1,25 @@
+Feature: Querying the API
+  In order to see if I can take a bike at a given station
+  As a user of the velibe cli
+  I want to be able to query the api through the velibe cli
+
+Background: Favorites Exists
+  Given my favorites stations are 22, 42, 68
+
+Scenario: By Default, my favorites are queried
+  Given a file named "file.txt" with:
+   """
+   Hello World
+   """
+  Then the file "file.txt" should contain:
+   """
+   Hello World
+   """
+
+
+Scenario: I can specify the station i'm interested into
+
+
+
+
+Scenario: Wrong arguments are ignored and warning is printed

data/lib/velibe.rb

@@ -50,7 +50,7 @@ module Velibe
   end
 
   def self.add_favorite(stations)
-    KvStore.add_favorite_station(*stations)
+    KvStore.add_favorite_station *stations
   end
 
   def self.setup_station_database(force = false)

data/lib/velibe/config.rb

@@ -0,0 +1,15 @@
+module Velibe
+  module Config
+    #  §see: http://stackoverflow.com/questions/7828066/accessing-files-packaged-into-a-ruby-gem
+
+    DB_NAME = ENV['VELIBE_DB_PATH'] || '~/.velib.db'
+    DB_PATH = Pathname.new(DB_NAME).expand_path # .to_s?
+    DATA_CSV = '../../data/Paris.csv'
+
+    DATA_CSV_FILE = File.join(File.dirname(File.expand_path(__FILE__)), DATA_CSV)
+
+    KV_NAME =  ENV['VELIBE_CONFIG_PATH'] || '~/.velib.yaml'
+    KV_PATH = Pathname.new(KV_NAME).expand_path
+
+  end
+end

data/lib/velibe/db/database.rb

@@ -6,15 +6,12 @@ require 'sqlite3'
 require 'active_record'
 require 'csv'
 require 'velibe/db/models'
+require 'velibe/config'
 
 module Velibe
 
   module Database
-    DB_NAME = '~/.velib.db' # TODO: more generic + config
-    DB_PATH = Pathname.new(DB_NAME).expand_path # .to_s?
-    DATA_CSV = '../../../data/Paris.csv'
-    DATA_CSV_FILE = File.join(File.dirname(File.expand_path(__FILE__)), DATA_CSV)
-    #  §see: http://stackoverflow.com/questions/7828066/accessing-files-packaged-into-a-ruby-gem
+    include Config
 
     def self.exist?
       DB_PATH.exist? # §check

data/lib/velibe/db/kv_store.rb

@@ -1,34 +1,44 @@
 # -*- coding: utf-8 -*-
 require 'moneta'
 require 'pathname'
+require 'velibe/config'
 
 module Velibe
 
   module KvStore
-    NAME = '~/.velib.yaml' # TODO: more generic
-    PATH = Pathname.new(NAME).expand_path
-    DB = Moneta.new(:YAML, file: PATH)
+    include Config
 
+    KV_DB = Moneta.new(:YAML, file: KV_PATH)
     FAV_KEY = 'favorites'
 
+    def self.db
+      KV_DB
+    end
+
+    def self.fav_key
+      FAV_KEY
+    end
+
     def self.token
-      DB['token']
+      KV_DB['token']
     end
 
-    def self.reset_favorite_stations
-      DB[FAV_KEY] = []
+    def self.reset_favorite_stations(*new_stations)
+      KV_DB[FAV_KEY] = new_stations.collect(&:to_i)
     end
 
     def self.favorite_stations
-      DB[FAV_KEY]
+      KV_DB[FAV_KEY]
     end
 
     def self.add_favorite_station(*stations)
-      fav = DB[FAV_KEY]
+      fav = KV_DB[FAV_KEY]
       # TODO: handle setup
       # TODO: check existing station
-      stations.each { |station| fav.push(station) unless fav.include?(station) }
-      DB[FAV_KEY] = fav
+      stations.collect(&:to_i).each do |station|
+        fav.push(station) unless fav.include?(station)
+        end
+      KV_DB[FAV_KEY] = fav
     end
 
   end

data/lib/velibe/version.rb

@@ -1,3 +1,3 @@
 module Velibe
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

data/spec/kv_store_spec.rb

@@ -0,0 +1,78 @@
+require 'spec_helper'
+
+
+describe Velibe::KvStore do
+
+
+  before { Velibe::KvStore.db[Velibe::KvStore.fav_key] = [2, 3, 4] }
+  let(:favorites) { Velibe::KvStore.favorite_stations }
+
+
+  describe '#token' do
+    let(:token) { Velibe::KvStore.token }
+    context 'no token in conf' do
+      before { Velibe::KvStore.db.delete 'token'}
+      it { expect(token).to be_nil }
+    end
+    context 'with token in conf' do
+      before { Velibe::KvStore.db['token'] = 'fake-test-value' }
+      it { expect(token).to eq 'fake-test-value' }
+    end
+  end
+
+  describe '#favorite_stations' do
+    it { expect(favorites).to eq [2, 3, 4] }
+  end
+
+  describe '#reset_favorite_stations' do
+
+    context 'default arguments' do
+      before { Velibe::KvStore.reset_favorite_stations }
+      it { expect(favorites).to eq [] }
+    end
+
+    context 'specific arguments' do
+      before { Velibe::KvStore.reset_favorite_stations 12, 42 }
+      it { expect(favorites).to eq [12, 42] }
+    end
+
+    context 'specific arguments as string' do
+      before { Velibe::KvStore.reset_favorite_stations '33' }
+      it { expect(favorites).to eq [33] }
+    end
+
+  end
+
+  describe '#add_favorite_station' do
+    before { Velibe::KvStore.add_favorite_station *new_fav }
+    let(:final_fav) { Velibe::KvStore.favorite_stations }
+
+    context 'single new favorite' do
+      let(:new_fav) { 5 }
+      it { expect(final_fav).to eq (2..5).to_a }
+    end
+
+    context 'list of favorites' do
+      let(:new_fav) { (5..10).to_a }
+      it { expect(final_fav).to eq (2..10).to_a }
+    end
+
+    context 'single new as string' do
+      let(:new_fav) { '5' }
+      it { expect(final_fav).to eq (2..5).to_a }
+    end
+
+    context 'ignore duplicates' do
+      let(:new_fav) { (3..5).to_a }
+      it { expect(final_fav).to eq (2..5).to_a }
+    end
+
+    context 'no values' do
+      let(:new_fav) {}
+      it { expect(final_fav).to eq (2..4).to_a }
+    end
+
+
+  end
+
+end

data/spec/spec_helper.rb

@@ -1,5 +1,9 @@
 velibe_lib = File.expand_path('../../lib', __FILE__)
 
+ENV['VELIBE_DB_PATH'] = '/tmp/velibe.db'
+ENV['VELIBE_CONFIG_PATH'] = '/tmp/velibe.yaml'
+ENV['VELIBE_TOKEN'] = 'fake-test-value'
+
 if ENV['TRAVIS']
   require 'simplecov'
   require 'coveralls'
@@ -8,6 +12,8 @@ if ENV['TRAVIS']
   SimpleCov.start do
     # No need to report coverage metrics for the test code
     add_filter 'test'
+    add_filter 'features'
+    add_filter 'data'
   end
 
   # Eager load the entire lib directory so that SimpleCov is able to report

data/velibe.gemspec

@@ -26,6 +26,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.6'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'cucumber'
+  spec.add_development_dependency 'aruba', '~> 0.11.1'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'coveralls'
   spec.add_development_dependency 'jazz_fingers'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: velibe
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Adriean Khisbe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-02 00:00:00.000000000 Z
+date: 2015-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -108,6 +108,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: aruba
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.11.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.11.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -186,13 +214,20 @@ files:
 - bin/velibe
 - data/Paris.csv
 - data/Paris.json
+- features/step_definitions/config_steps.rb
+- features/support/aruba.rb
+- features/support/env.rb
+- features/velibe_favorites.feature
+- features/velibe_query.feature
 - lib/velibe.rb
 - lib/velibe/api_velib.rb
+- lib/velibe/config.rb
 - lib/velibe/db/database.rb
 - lib/velibe/db/kv_store.rb
 - lib/velibe/db/models.rb
 - lib/velibe/station_status.rb
 - lib/velibe/version.rb
+- spec/kv_store_spec.rb
 - spec/spec_helper.rb
 - spec/station_status_spec.rb
 - velibe.gemspec
@@ -222,6 +257,12 @@ signing_key:
 specification_version: 4
 summary: Small Velib Utility
 test_files:
+- features/step_definitions/config_steps.rb
+- features/support/aruba.rb
+- features/support/env.rb
+- features/velibe_favorites.feature
+- features/velibe_query.feature
+- spec/kv_store_spec.rb
 - spec/spec_helper.rb
 - spec/station_status_spec.rb
 has_rdoc: