oolite 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29b82b603f54c118604880e334dc641e9ae9d06c
-  data.tar.gz: 4ca7a991985fc798b3d83814a3074a16edc2737e
+  metadata.gz: a0eacc2db825856e9b197799928c07c79d46f48c
+  data.tar.gz: 08add855baa60fc715f6d52740fab9c856523aeb
 SHA512:
-  metadata.gz: 40dbea1d74449ff19e6669dcf9fa7e96542dc0127a8824885abd0e1d33ee4bb56236e66b232d40dee5d183fd7facb1d2c06e0916a8ec06ec75a26f24b6199711
-  data.tar.gz: 913d50a5080b2b1f2044f5ea397dd679e0fbc691bc2c1c43c8a18634205a579605aeaa06f9024ae5fc834abf3756e3f8ab696db3f035512cec50cdcacdbf14f6
+  metadata.gz: 6e72c5e6b8b21ba44b4d82a5b23792a42bc03071a0da2934299b4694977308d33943b9a9ee9f9e35bb5c1bacdffebe1d86b33b889564256c6ae15517d85561e8
+  data.tar.gz: 94cdc383bb4a0e47da8326e861990a9c63b647aca128c156bd293a5a5f50223fd71542b00fa9555a974fe04ccea110faf1cf94b3fd8e3d225528766e2bf829ec

data/.rspec

@@ -0,0 +1,3 @@
+--color
+--require spec_helper
+#--require pry

data/README.md

@@ -1,6 +1,6 @@
 # Oolite
 
-Utility scripts for monitoring the Oolite game's system markets and
+Utility scripts for monitoring the [Oolite](http://www.oolite.org/) game's system markets and
 providing trading suggestions based on the market data.
 
 ## Installation

data/lib/oolite.rb

@@ -1,4 +1,7 @@
 require "oolite/version"
+require 'pathname'
+require 'yaml'
+require 'highline/import'
 
 if ENV['DEBUG'].nil?
   $debug = false
@@ -137,25 +140,25 @@ module Oolite
       ]
 
       @economies = [
-        "Rich Industrial",
+        "Average Agricultural",
         "Average Industrial",
-        "Poor Industrial",
-        "Mainly Industrial",
         "Mainly Agricultural",
+        "Mainly Industrial",
+        "Poor Agricultural",
+        "Poor Industrial",
         "Rich Agricultural",
-        "Average Agricultural",
-        "Poor Agricultural"
+        "Rich Industrial",
       ]
 
       @governments = [
         "Anarchy",
-        "Feudal",
-        "Multi-Government",
-        "Dictatorship",
         "Communist",
         "Confederacy",
+        "Corporate State",
         "Democracy",
-        "Corporate State"
+        "Dictatorship",
+        "Feudal",
+        "Multi-Government",
       ]
 
       @systems = Hash.new
@@ -178,11 +181,13 @@ module Oolite
   end # Configuration
 end
 
-require 'yaml'
 
 # Initialize the configuration
 Oolite.configure
 
+require 'oolite/console'
+require 'oolite/system_data'
+require 'oolite/systems_data'
 require 'oolite/csv_doc'
 require 'oolite/save_file'
 require 'oolite/market_file'

data/lib/oolite/console.rb

@@ -0,0 +1,41 @@
+##############################################################################
+# File::    console.rb
+# Purpose:: Console Module includes helper methods related to console IO
+# 
+# Author::    Jeff McAffee 05/22/2015
+# Copyright:: Copyright (c) 2015, kTech Systems LLC. All rights reserved.
+# Website::   http://ktechsystems.com
+##############################################################################
+
+module Oolite
+  module Console
+    def select_system systems, header, prompt = "? "
+      selected_system = choose do |menu|
+        menu.index = :letter
+        menu.index_suffix = " - "
+        menu.header = header
+        menu.prompt = prompt
+
+        systems.each do |sys|
+          info = system_info sys
+          menu.choice "#{sys.ljust(14)} #{info.ljust(50)}" do sys end
+        end
+
+        menu.choice :quit do 'q' end
+      end
+    end
+
+    def select_from items, header, prompt = "? "
+      selected_item = choose do |menu|
+        #menu.index = :number
+        menu.index_suffix = " - "
+        menu.header = header
+        menu.prompt = prompt
+
+        items.each do |item|
+          menu.choice item do item end
+        end
+      end
+    end
+  end
+end # module

data/lib/oolite/market.rb

@@ -115,9 +115,9 @@ module Oolite
         config.current_system_name = system
 
         unless config.systems.key?(system)
-          details = { economy: nil,
-                      government: nil,
-                      tech_level: nil,
+          details = { economy: '',
+                      government: '',
+                      tech_level: '',
           }
           config.systems[system] = details
         end

data/lib/oolite/system_data.rb

@@ -0,0 +1,73 @@
+##############################################################################
+# File::    system_data.rb
+# Purpose:: SystemData stores info about a single system
+#           (ie. economy, government, etc)
+#
+# Author::    Jeff McAffee 05/22/2015
+# Copyright:: Copyright (c) 2015, kTech Systems LLC. All rights reserved.
+# Website::   http://ktechsystems.com
+##############################################################################
+
+module Oolite
+  class SystemData
+    attr_reader :name, :economy, :government, :tech_level
+
+    def initialize name, data
+      data = Hash(data)
+
+      self.name = name
+      self.economy = data[:economy]
+      self.government = data[:government]
+      self.tech_level = data[:tech_level]
+    end
+
+    def name= val
+      fail "SystemData#name= name is nil" if val.nil?
+      fail "SystemData#name= name is empty" if val.empty?
+      @name = val
+    end
+
+    def economy= val
+      if val.nil?
+        @economy = ''
+      else
+        @economy = val
+      end
+    end
+
+    def government= val
+      if val.nil?
+        @government = ''
+      else
+        @government = val
+      end
+    end
+
+    def tech_level= val
+      if val.nil?
+        @tech_level = ''
+      else
+        @tech_level = val
+      end
+    end
+
+    #
+    # When emitting as YAML, emit as a hash
+    #
+
+    def to_yaml
+      {
+        economy: @economy,
+        government: @government,
+        tech_level: @tech_level,
+      }
+    end
+
+    def all_data_present?
+      return false if economy.nil? || economy.empty?
+      return false if government.nil? || government.empty?
+      return false if tech_level.nil? || tech_level.empty?
+      return true
+    end
+  end
+end

data/lib/oolite/systems_data.rb

@@ -0,0 +1,49 @@
+##############################################################################
+# File::    systems_data.rb
+# Purpose:: SystemsData stores info about systems
+#           (ie. economy, government, etc)
+#
+# Author::    Jeff McAffee 05/22/2015
+# Copyright:: Copyright (c) 2015, kTech Systems LLC. All rights reserved.
+# Website::   http://ktechsystems.com
+##############################################################################
+
+module Oolite
+  class SystemsData
+    def self.systems
+      @systems ||= read_config
+    end
+
+    def self.names
+      systems.keys
+    end
+
+    def self.add sys_data
+      systems[sys_data.name] = sys_data
+      write_config
+    end
+
+    private
+
+    def self.read_config
+      data = Oolite.configuration.systems
+      sys_objs = Hash.new
+
+      data.each do |name, sys_data|
+        sys_objs[name] = SystemData.new name, sys_data
+      end
+
+      sys_objs
+    end
+
+    def self.write_config
+      Oolite.configure do |config|
+        systems.each do |name, sys|
+          config.systems[name] = sys.to_yaml
+        end
+      end
+
+      Oolite.save_configuration
+    end
+  end
+end

data/lib/oolite/trade.rb

@@ -13,28 +13,23 @@ require 'yaml'
 
 module Oolite
   class Trade
+    include Console
+
     def display
       puts "= Oolite Trader ="
       puts
-      puts "  Current Location: #{current_system_name}"
-      puts
-      puts "  Available destinations:"
-      puts
+      ask_user_to_update_system_data(current_system_name)
 
-      systems = market.systems
-      systems.delete current_system_name
-      systems.each_with_index do |sys,i|
-        puts "      #{i} - #{sys}"
-      end
       puts
-      choice = ask "    Choose your destination (q to abort): "
-
-      return if choice.downcase == 'q'
+      puts "  Current Location: #{current_system_name} #{system_info(current_system_name)}"
       puts
 
-      dest_system = systems[choice.to_i]
+      dest_system = get_destination
+
+      return if dest_system == 'q'
 
-      puts "  -- Suggested Trades (best to worst) for #{dest_system} --"
+      puts
+      puts "  -- Profitable Trades for #{dest_system} --"
       puts
       puts "    #{'Item'.ljust(14)} #{'Amt Avail'.to_s.ljust(10)} #{'PricePerUnit'.to_s.rjust(8)} #{'ProfitPerUnit'.to_s.rjust(12)}"
       puts
@@ -46,7 +41,7 @@ module Oolite
 
       puts
 
-      puts "  -- Suggested Transactions for #{dest_system} --"
+      puts "  -- Suggested Transactions for #{current_system_name} to #{dest_system} Route --"
       puts
       puts "    #{'Item'.ljust(14)} #{'Purch Amt'.to_s.ljust(10)} #{'Profit'.to_s.rjust(8)}"
       puts
@@ -69,9 +64,79 @@ module Oolite
 
     private
 
-    def ask msg
-      print "#{msg}"
-      val = STDIN.getc
+    def systems_data
+      @systems_data ||= SystemsData
+    end
+
+    def system_info sys_name
+        info = ''
+        if systems_data.names.include? sys_name
+          sys_data = systems_data.systems[sys_name]
+
+          econ = sys_data.economy
+          gov = sys_data.government
+          tech = sys_data.tech_level
+
+          info = "(#{econ} - #{gov} - #{tech.to_s})"
+        end
+        info
+    end
+
+    def ask_user_to_update_system_data sys_name
+      need_update = false
+      need_update = true if !systems_data.names.include? sys_name
+      unless need_update
+        sys_data = systems_data.systems[sys_name]
+        need_update = true if !sys_data.all_data_present?
+      end
+
+      return unless need_update
+
+      if need_update
+        puts "We need to update our records for #{sys_name}"
+        result = ask("Would you like to update now (y/n)? ") { |q| q.default = 'y' }
+        return if result.downcase == 'n'
+      end
+
+      collect_system_data sys_name
+    end
+
+    def collect_system_data sys_name
+      econs = Oolite.configuration.economies.sort
+      govs = Oolite.configuration.governments.sort
+      prompt = ' Choice? '
+
+      puts "  #{sys_name}"
+
+      puts
+      econ = select_from econs, 'Economy', prompt
+
+      puts
+      gov = select_from govs, 'Government', prompt
+
+      puts
+      puts "Tech Level:"
+      puts
+      tech_level = ask " Choice (1-14)? "
+
+      sys_data = SystemData.new sys_name, {}
+      sys_data.economy = econ
+      sys_data.government = gov
+      sys_data.tech_level = tech_level
+
+      SystemsData.add sys_data
+
+      puts
+      puts " #{sys_name} has been updated."
+      puts
+    end
+
+    def get_destination
+      systems = market.systems
+      systems.delete current_system_name
+      systems.sort!
+
+      select_system systems, "Available destinations", "Choose your destination: "
     end
 
     def current_system_name
@@ -108,6 +173,12 @@ module Oolite
       end
     end
 
+    #
+    # Calculate and return all *profitable* trades.
+    #
+    # Returned trades are sorted most expensive to least
+    #
+
     def calculate_all_trades dest_system
       src = market.data[current_system_name]
       dest = market.data[dest_system]
@@ -119,7 +190,7 @@ module Oolite
         end
       end
 
-      positive_trades = Array.new
+      profitable_trades = Array.new
 
       src.keys.each do |item|
         sprice = src[item][:price]
@@ -128,18 +199,26 @@ module Oolite
 
         revenue = dprice - sprice
         if revenue > 0.0 && amount > 0
-          positive_trades << TradeItem.new(item, amount, sprice, revenue)
+          profitable_trades << TradeItem.new(item, amount, sprice, revenue)
         end
       end
 
-      positive_trades.sort { |a,b| b.revenue <=> a.revenue }
+      profitable_trades.sort { |a,b| b.revenue <=> a.revenue }
     end
 
+    #
+    # Calculate the most profitable trades.
+    #
+    # We calculate 2 ways, buying the most expensive (and generally the
+    # most profitable) trades, then buying the cheapest first. The most
+    # profit determines the suggested trades.
+    #
+
     def calc_best_trades trades
-      avail_cargo = Oolite.configuration.cargo
+      max_cargo = Oolite.configuration.cargo
       credits = Oolite.configuration.current_credits
 
-      if avail_cargo <= 0
+      if max_cargo <= 0
         return [[], 0]
       end
 
@@ -154,59 +233,61 @@ module Oolite
         return [[], 0]
       end
 
-      balance = credits
-      cargo = avail_cargo
-      suggested_trades_expensive_first = []
-      affordable_trades.each do |trade|
-        max_amt_by_price = balance / trade.cost
-        max_amt_by_cargo = [cargo, trade.amount].min
-        max_amt = [max_amt_by_price, max_amt_by_cargo].min
+      suggested_trades_exp = calc_trades(credits, max_cargo, affordable_trades)
+      total_profit_exp = calc_total_profit(suggested_trades_exp)
 
-        balance = balance - (max_amt * trade.cost)
-        cargo = cargo - max_amt
+      # Sort the trades in ascending order (cheapest first).
+      affordable_trades_asc = affordable_trades.sort { |a,b| a.revenue <=> b.revenue }
 
-        if max_amt > 0
-          transaction = { item: trade, amount: max_amt }
-          suggested_trades_expensive_first << transaction.dup
-        end
-      end
+      suggested_trades_cheap = calc_trades(credits, max_cargo, affordable_trades_asc)
+      total_profit_cheap = calc_total_profit(suggested_trades_cheap)
 
-      expensive_first_total_profit = 0
-      suggested_trades_expensive_first.each do |transaction|
-        profit = transaction[:item].revenue * transaction[:amount]
-        expensive_first_total_profit += profit
+      if total_profit_exp > total_profit_cheap
+        return [suggested_trades_exp, total_profit_exp]
+      else
+        return [suggested_trades_cheap, total_profit_cheap]
       end
+    end
+
+    #
+    # Calculate the best trades using available credits, cargo and profitable trades
+    #
+
+    def calc_trades credits, cargo, trades
+      suggested_trades = []
 
-      balance = credits
-      cargo = avail_cargo
-      suggested_trades_cheap_first = []
-      # Sort the trades in ascending order.
-      cheap_affordable_trades = affordable_trades.sort { |a,b| a.revenue <=> b.revenue }
-      cheap_affordable_trades.each do |trade|
-        max_amt_by_price = balance / trade.cost
+      trades.each do |trade|
+        # We're limited by how much we can buy,
+        max_amt_by_price = credits / trade.cost
+        # and cargo space versus amount for sale.
         max_amt_by_cargo = [cargo, trade.amount].min
         max_amt = [max_amt_by_price, max_amt_by_cargo].min
 
-        balance = balance - (max_amt * trade.cost)
+        credits = credits - (max_amt * trade.cost)
         cargo = cargo - max_amt
 
         if max_amt > 0
           transaction = { item: trade, amount: max_amt }
-          suggested_trades_cheap_first << transaction.dup
+          suggested_trades << transaction.dup
         end
       end
 
-      cheap_first_total_profit = 0
-      suggested_trades_cheap_first.each do |transaction|
+      suggested_trades
+    end
+
+    #
+    # Calculate the total anticipated profit if all trades are transacted.
+    #
+
+    def calc_total_profit trades
+      total_profit = 0
+
+      trades.each do |transaction|
         profit = transaction[:item].revenue * transaction[:amount]
-        cheap_first_total_profit += profit
+        total_profit += profit
       end
 
-      if expensive_first_total_profit > cheap_first_total_profit
-        return [suggested_trades_expensive_first, expensive_first_total_profit]
-      else
-        return [suggested_trades_cheap_first, cheap_first_total_profit]
-      end
+      total_profit
     end
   end
 end

data/lib/oolite/version.rb

@@ -1,3 +1,3 @@
 module Oolite
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/oolite.gemspec

@@ -20,6 +20,8 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rspec", "~> 3.2"
 
   spec.add_runtime_dependency "nokogiri", "~> 1.6"
+  spec.add_runtime_dependency "highline", "~> 1.7"
 end

data/spec/data/.oolite

@@ -0,0 +1,142 @@
+--- !ruby/object:Oolite::Configuration
+save_file_path: "/home/jeff/Jameson.oolite-save"
+market_data_filename: oolite.market
+current_system_name: Edinso
+current_credits: 39558
+cargo: 35
+trade_contraband: false
+contraband:
+- Slaves
+- Narcotics
+- Firearms
+economies:
+- Rich Industrial
+- Average Industrial
+- Poor Industrial
+- Mainly Industrial
+- Mainly Agricultural
+- Rich Agricultural
+- Average Agricultural
+- Poor Agricultural
+governments:
+- Anarchy
+- Feudal
+- Multi-Government
+- Dictatorship
+- Communist
+- Confederacy
+- Democracy
+- Corporate State
+systems:
+  Ensoreus:
+    :economy: Rich Industrial
+    :government: Corporate State
+    :tech_level: '12'
+  Isinor:
+    :economy: Poor Agricultural
+    :government: Confederacy
+    :tech_level: '7'
+  Qutiri:
+    :economy: Rich Industrial
+    :government: Multi-Government
+    :tech_level: '9'
+  Zaonce:
+    :economy: Average Industrial
+    :government: Corporate State
+    :tech_level: '12'
+  Tionisla:
+    :economy: Average Industrial
+    :government: Democracy
+    :tech_level: '12'
+  Bemaera:
+    :economy: Average Agricultural
+    :government: Multi-Government
+    :tech_level: '4'
+  Ontiat:
+    :economy: Average Agricultural
+    :government: Confederacy
+    :tech_level: '6'
+  Xeesle:
+    :economy: Mainly Industrial
+    :government: Feudal
+    :tech_level: '7'
+  Aronar:
+    :economy: Poor Industrial
+    :government: Feudal
+    :tech_level: '8'
+  Aesbion:
+    :economy: Mainly Industrial
+    :government: Corporate State
+    :tech_level: '10'
+  Lave:
+    :economy: Rich Agricultural
+    :government: Dictatorship
+    :tech_level: '5'
+  Esesla:
+    :economy: Average Agricultural
+    :government: Multi-Government
+    :tech_level: '4'
+  Zalela:
+    :economy: Average Agricultural
+    :government: Feudal
+    :tech_level: '5'
+  Erlaza:
+    :economy: Average Agricultural
+    :government: Dictatorship
+    :tech_level: '6'
+  Leesti:
+    :economy: Poor Industrial
+    :government: Corporate State
+    :tech_level: '11'
+  Diso:
+    :economy: Average Agricultural
+    :government: Democracy
+    :tech_level: '8'
+  Orerve:
+    :economy: Mainly Industrial
+    :government: Feudal
+    :tech_level: '6'
+  Riedquat:
+    :economy: Poor Agricultural
+    :government: Anarchy
+    :tech_level: '4'
+  Reorte:
+    :economy: Poor Agricultural
+    :government: Dictatorship
+    :tech_level: '6'
+  Quator:
+    :economy: Mainly Industrial
+    :government: Anarchy
+    :tech_level: '7'
+  Orrere:
+    :economy: Poor Agricultural
+    :government: Corporate State
+    :tech_level: '7'
+  Uszaa:
+    :economy: Mainly Industrial
+    :government: Anarchy
+    :tech_level: '8'
+  Ra:
+    :economy: Poor Agricultural
+    :government: Corporate State
+    :tech_level: '5'
+  Relaes:
+    :economy: Average Industrial
+    :government: Communist
+    :tech_level: '11'
+  Zasoer:
+    :economy: Average Agricultural
+    :government: Confederacy
+    :tech_level: '5'
+  Azaqu:
+    :economy: Average Agricultural
+    :government: Democracy
+    :tech_level: '7'
+  Begeabi:
+    :economy: Poor Agricultural
+    :government: Feudal
+    :tech_level: '2'
+  Edinso:
+    :economy: ''
+    :government: ''
+    :tech_level: ''

data/spec/lib/oolite/system_data_spec.rb

@@ -0,0 +1,59 @@
+RSpec.describe SystemData do
+
+  #let(:test_config_path) { test_data_dir('.oolite') }
+  #let(:load_config) { Oolite.load_configuration(test_config_path) }
+
+  #before do
+  #  load_config
+  #end
+
+  let(:system_data) do
+    data = {
+      economy: 'economy',
+      government: 'government',
+      tech_level: '12'
+    }
+  end
+
+  let(:empty_system_data) do
+    data = {
+      economy: '',
+      government: '',
+      tech_level: ''
+    }
+  end
+
+  it 'can be instantiated' do
+    expect(SystemData.new('name', system_data)).to_not be nil
+  end
+
+  it 'stores data' do
+    actual = SystemData.new('name', system_data)
+
+    expect(actual.name).to eq 'name'
+    expect(actual.economy).to eq system_data[:economy]
+    expect(actual.government).to eq system_data[:government]
+    expect(actual.tech_level).to eq system_data[:tech_level]
+  end
+
+  it 'emits a hash for yaml storage' do
+    actual = SystemData.new('name', system_data)
+
+    expect(actual.to_yaml).to eq system_data
+  end
+
+  it 'can tell if all data is present' do
+    sysdata = SystemData.new('name', empty_system_data)
+
+    expect(sysdata.all_data_present?).to eq false
+
+    sysdata.economy = 'econ'
+    expect(sysdata.all_data_present?).to eq false
+
+    sysdata.government = 'gov'
+    expect(sysdata.all_data_present?).to eq false
+
+    sysdata.tech_level = '12'
+    expect(sysdata.all_data_present?).to eq true
+  end
+end

data/spec/lib/oolite/systems_data_spec.rb

@@ -0,0 +1,37 @@
+RSpec.describe SystemsData do
+
+  let(:test_config_path) { temp_from_data_dir('.oolite') }
+  let(:load_config) { Oolite.load_configuration(test_config_path) }
+
+  before do
+    load_config
+  end
+
+  it 'loads systems data from config' do
+    expect(SystemsData.systems.count).to be >= 28
+    ensoreus = SystemsData.systems['Ensoreus']
+
+    expect(ensoreus.name).to eq "Ensoreus"
+    expect(ensoreus.economy).to eq "Rich Industrial"
+    expect(ensoreus.government).to eq "Corporate State"
+    expect(ensoreus.tech_level).to eq "12"
+  end
+
+  it 'returns list of system names' do
+    names = SystemsData.names
+    expect(names).to include 'Ensoreus'
+    expect(names).to include 'Lave'
+    expect(names).to include 'Diso'
+  end
+
+  it 'adds to the list' do
+    expect(SystemsData.names).to_not include 'New System'
+    new_sys = SystemData.new('New System', { economy: 'Economy', government: 'Government', tech_level: '12'} )
+
+    SystemsData.add new_sys
+    expect(SystemsData.names).to include 'New System'
+    expect(SystemsData.systems['New System']).to eq new_sys
+
+    expect(file_contains(test_config_path, 'New SysteM'))
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,120 @@
+# This file was generated by the `rspec --init` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# The generated `.rspec` file contains `--require spec_helper` which will cause
+# this file to always be loaded, without a need to explicitly require it in any
+# files.
+#
+# Given that it is always loaded, you are encouraged to keep this file as
+# light-weight as possible. Requiring heavyweight dependencies from this file
+# will add to the boot time of your test suite on EVERY test run, even for an
+# individual file that may not need all of that loaded. Instead, consider making
+# a separate helper file that requires the additional dependencies and performs
+# the additional setup, and require it from the spec files that actually need
+# it.
+#
+# The `.rspec` file also contains a few flags that are not defaults but that
+# users commonly want.
+#
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+RSpec.configure do |config|
+  # rspec-expectations config goes here. You can use an alternate
+  # assertion/expectation library such as wrong or the stdlib/minitest
+  # assertions if you prefer.
+  config.expect_with :rspec do |expectations|
+    # This option will default to `true` in RSpec 4. It makes the `description`
+    # and `failure_message` of custom matchers include text for helper methods
+    # defined using `chain`, e.g.:
+    #     be_bigger_than(2).and_smaller_than(4).description
+    #     # => "be bigger than 2 and smaller than 4"
+    # ...rather than:
+    #     # => "be bigger than 2"
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  # rspec-mocks config goes here. You can use an alternate test double
+  # library (such as bogus or mocha) by changing the `mock_with` option here.
+  config.mock_with :rspec do |mocks|
+    # Prevents you from mocking or stubbing a method that does not exist on
+    # a real object. This is generally recommended, and will default to
+    # `true` in RSpec 4.
+    mocks.verify_partial_doubles = true
+  end
+
+# The settings below are suggested to provide a good initial experience
+# with RSpec, but feel free to customize to your heart's content.
+#=begin
+  # These two settings work together to allow you to limit a spec run
+  # to individual examples or groups you care about by tagging them with
+  # `:focus` metadata. When nothing is tagged with `:focus`, all examples
+  # get run.
+  config.filter_run :focus
+  config.run_all_when_everything_filtered = true
+
+  # Limits the available syntax to the non-monkey patched syntax that is
+  # recommended. For more details, see:
+  #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
+  #   - http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
+  #   - http://myronmars.to/n/dev-blog/2014/05/notable-changes-in-rspec-3#new__config_option_to_disable_rspeccore_monkey_patching
+  config.disable_monkey_patching!
+
+  # This setting enables warnings. It's recommended, but in some cases may
+  # be too noisy due to issues in dependencies.
+  config.warnings = false
+
+  # Many RSpec users commonly either run the entire suite or an individual
+  # file, and it's useful to allow more verbose output when running an
+  # individual spec file.
+  if config.files_to_run.one?
+    # Use the documentation formatter for detailed output,
+    # unless a formatter has already been configured
+    # (e.g. via a command-line flag).
+    config.default_formatter = 'doc'
+  end
+
+  # Print the 10 slowest examples and example groups at the
+  # end of the spec run, to help surface which specs are running
+  # particularly slow.
+  #config.profile_examples = 10
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = :random
+
+  # Seed global randomization in this process using the `--seed` CLI option.
+  # Setting this allows you to use `--seed` to deterministically reproduce
+  # test failures related to randomization by passing the same `--seed` value
+  # as the one that triggered the failure.
+  Kernel.srand config.seed
+#=end
+end
+
+lib_dir = File.expand_path('../../lib', __FILE__)
+$LOAD_PATH.unshift(lib_dir) unless $LOAD_PATH.include?(lib_dir)
+
+require 'fileutils'
+require 'oolite'
+include Oolite
+
+def test_data_dir sub_path = nil
+  path = File.expand_path('../data', __FILE__)
+  path = Pathname(path)
+  path = path + sub_path unless sub_path.nil?
+  path.to_s
+end
+
+def temp_from_data_dir sub_path = nil
+  src = test_data_dir sub_path
+  dest = Pathname('tmp') + sub_path
+  dest.delete if dest.exist?
+  FileUtils.cp src, dest
+  dest
+end
+
+def file_contains file, needle
+  File.open(file, 'r').each do |ln|
+    return true if ln.include? needle
+  end
+  return false
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oolite
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Jeff McAffee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-21 00:00:00.000000000 Z
+date: 2015-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
 description: Utility scripts for tracking markets and assisting with trading in the
   Oolite game.
 email:
@@ -64,6 +92,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -72,13 +101,20 @@ files:
 - bin/ootrader
 - bin/ooupdatemarket
 - lib/oolite.rb
+- lib/oolite/console.rb
 - lib/oolite/csv_doc.rb
 - lib/oolite/market.rb
 - lib/oolite/market_file.rb
 - lib/oolite/save_file.rb
+- lib/oolite/system_data.rb
+- lib/oolite/systems_data.rb
 - lib/oolite/trade.rb
 - lib/oolite/version.rb
 - oolite.gemspec
+- spec/data/.oolite
+- spec/lib/oolite/system_data_spec.rb
+- spec/lib/oolite/systems_data_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/jmcaffee/oolite
 licenses:
 - MIT
@@ -103,5 +139,9 @@ rubygems_version: 2.3.0
 signing_key: 
 specification_version: 4
 summary: Utility scripts for the Oolite game
-test_files: []
+test_files:
+- spec/data/.oolite
+- spec/lib/oolite/system_data_spec.rb
+- spec/lib/oolite/systems_data_spec.rb
+- spec/spec_helper.rb
 has_rdoc: