fuelator 0.1.6 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0bec4abc5efa33fcc9f79013f97f931ed7c5ab1
-  data.tar.gz: a25945039a85d4bf73065dbad1c869a6efde096e
+  metadata.gz: 5416ce6623bcb51712442348a4448680547eee2f
+  data.tar.gz: 98bec05528369e27984bac348b22df71ae7a1ab0
 SHA512:
-  metadata.gz: 5fcdc1c966251aeb76a232c7b8f5c182901a72885ab054fc2dbd46fec5490a9f9ce6ce42dc56a344a7aea2dbda1fa291f89a2e87e95a4a10da626de84ba476c9
-  data.tar.gz: d629265f46eb5a8f9f223a8c8079f057f133658674eca2b4d32d534d6b21aa7516ddaab40f1e0ade421d6f47f9c1b48058d8b24ea78ae708fb2e613bcaf1f465
+  metadata.gz: 7a090956b7255abb57bc948fa29a1149353a061568948f4ad68c623b3d57c3b6b1aacf130a6ac47e92e105ef5b30d240b86c2049497420d87c4acdbe9b4a8c64
+  data.tar.gz: 7af816a52eaab8f41f87920d1d7ed6fa72d5fe079dda3227d0f28f81537bf8995b4b76182ac243088fbb22c488dd64112f49866a7a852b0ac24074afa3252579

data/Gemfile

@@ -5,3 +5,4 @@ gemspec
 
 gem "rake", "~> 12.0"
 gem "rspec", "~> 3.0"
+gem 'pry'

data/Gemfile.lock

@@ -1,12 +1,17 @@
 PATH
   remote: .
   specs:
-    fuelator (0.1.6)
+    fuelator (0.1.8)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    coderay (1.1.3)
     diff-lcs (1.3)
+    method_source (1.0.0)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
     rake (12.3.3)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
@@ -27,6 +32,7 @@ PLATFORMS
 
 DEPENDENCIES
   fuelator!
+  pry
   rake (~> 12.0)
   rspec (~> 3.0)
 

data/bin/fuelator.rb

@@ -0,0 +1,85 @@
+#!/usr/bin/env ruby
+
+require "fuelator"
+require 'optparse'
+
+class OptsParser
+  Version = Fuelator::VERSION
+
+  class Options
+    attr_accessor :verbose, :mass, :pairs
+
+    def initialize
+      @verbose = false
+      @mass    = 0
+      @pairs   = []
+    end
+  end
+
+  def self.parse
+    @options = Options.new
+    parser.parse!
+    @options
+  end
+
+  def self.parser
+    @parser ||= OptionParser.new do |parser|
+      parser.banner = "Usage: fuelator [options]"
+      parser.separator ""
+      parser.separator "Specific options:"
+
+      boolean_verbose_option parser
+      float_mass_option(parser)
+      list_pairs_option(parser)
+
+      parser.separator ""
+      parser.separator "Common options:"
+      # No argument, shows at tail. This will print an options summary.
+      # Try it and see!
+      parser.on_tail("-h", "--help", "Show this message") do
+        puts parser
+        exit
+      end
+      # Another typical switch to print the version.
+      parser.on_tail("--version", "Show version") do
+        puts Version
+        exit
+      end
+    end
+  end
+
+  def self.boolean_verbose_option(parser)
+    # Boolean switch.
+    parser.on("-v", "--[no-]verbose", "Show error backtrace") do |v|
+      @options.verbose = v
+    end
+  end
+
+  def self.float_mass_option(parser)
+    # Mass required float option.
+    parser.on("-m", "--mass MASS", Float, "Space ship mass") do |v|
+      @options.mass = v
+    end
+  end
+
+  def self.list_pairs_option(parser)
+    # List of arguments.
+    parser.on("-p", "--pair PAIRS", Array, "Directive/gravity comma separated pairs: -p launch,9.2 -p land,2.2") do |list|
+      list = list.map { |v| (!!Float(v) rescue false) ? v.to_f : v.to_sym }
+      @options.pairs << list
+    end
+  end
+end
+
+def run_script
+  options = OptsParser.parse
+  begin
+    puts "#{Fuelator::Calc.new(options.mass, options.pairs).run} kg"
+  rescue Fuelator::Parameters::Error, StandardError => e
+    puts e
+    puts e.backtrace if options.verbose
+  end
+end
+
+ARGV << '-h' if ARGV.empty?
+run_script

data/lib/fuelator.rb

@@ -1,54 +1,8 @@
 require "fuelator/version"
+require 'fuelator/parameters/validator'
+require 'fuelator/parameters/pair'
 require "fuelator/parameters"
-# Calculation of fuel required for flight based on input params
+require "fuelator/calc"
 
 module Fuelator
-  # Calculate fuel for a flight
-  #
-  # Example:
-  #   >> Fuelator.calculate(28801, [[:launch, 9.807], [:land, 1.62], [:launch, 1.62], [:land, 9.807]])
-  #   => 51898
-
-  class Error < StandardError; end
-
-  FLIGHT_CONSTANTS = {
-    launch: {
-      theta: 0.042,
-      bias:  33,
-    },
-    land:   {
-      theta: 0.033,
-      bias:  42,
-    },
-  }
-
-  # @param [Array] params
-  # Example:
-  #      [123, [[:launch, 123]]] or flatten [123, :launch, 123]
-  # params are validated and validation error may be raised
-  # @return Float - fuel for a flight
-  def self.calculate(*params)
-    parameters = Parameters.new(params)
-
-    full_mass = parameters.mass
-
-    parameters.pairs.reverse.map do |val|
-      full_mass += recursive_calculate(full_mass, val)
-    end.last - parameters.mass
-  end
-
-  private
-
-  def self.recursive_calculate(mass, pair)
-    directive = pair.directive
-    gravity   = pair.gravity
-    constants = FLIGHT_CONSTANTS[directive]
-
-    fuel_mass = (mass * gravity * constants[:theta] - constants[:bias]).to_i # rounded down
-
-
-    return 0 if fuel_mass <= 0
-    result = recursive_calculate(fuel_mass, pair)
-    fuel_mass + result
-  end
 end

data/lib/fuelator/calc.rb

@@ -0,0 +1,46 @@
+# Calculation of fuel required for flight based on input params
+
+module Fuelator
+  # Calculate fuel for a flight
+  #
+  # Example:
+  #   >> Fuelator.Calc.new(28801, [[:launch, 9.807], [:land, 1.62], [:launch, 1.62], [:land, 9.807]]).run
+  #   => 51898
+  class Calc
+    attr_reader :parameters
+
+    FLIGHT_CONSTANTS = {
+      launch: {
+        theta: 0.042,
+        bias:  33,
+      },
+      land:   {
+        theta: 0.033,
+        bias:  42,
+      },
+    }
+
+    def initialize(mass, pairs)
+      @parameters = Parameters.new(mass, pairs)
+    end
+
+    def run
+      full_mass = parameters.mass
+
+      parameters.reversed.map do |val|
+        full_mass += recursive_calculate(full_mass, val)
+      end.last - parameters.mass
+    end
+
+    private
+
+    def recursive_calculate(mass, pair)
+      constants = FLIGHT_CONSTANTS[pair.directive]
+      fuel_mass = (mass * pair.gravity * constants[:theta] - constants[:bias]).to_i # rounded down
+
+      return 0 if fuel_mass <= 0
+      result = recursive_calculate(fuel_mass, pair)
+      fuel_mass + result
+    end
+  end
+end

data/lib/fuelator/parameters.rb

@@ -1,53 +1,46 @@
-require 'fuelator/parameters/pair'
 # For flight parameters validation purposes
 
 module Fuelator
   class Parameters
+    include Validator
+
     class Error < StandardError; end
 
-    attr_reader :mass, :pairs, :directives_sequential
+    attr_reader :mass, :pairs, :order
 
-    def initialize(params)
-      params                   = normalize(params)
-      @mass                    = params[0]
-      @pairs                   = params[1..-1].each_slice(2).to_a
-                                   .map { |pair| Pair.new(pair) }
-      @directives_sequential = directives_sequential?
+    def initialize(mass, pairs)
+      @mass  = mass
+      @pairs = pairs.map { |pair| Pair.new(pair) }
+      @order = define_order
 
       validate!
     end
 
-    private
-
-    def normalize(params)
-      params.flatten.map { |v| (!!Float(v) rescue false) ? v.to_f : v.to_sym }
+    def reversed
+      pairs.reverse
     end
 
-    def validate!
-      instance_variables.each do |v|
-        v_name = v.to_s.gsub(/^@/, '')
-        raise Error.new("value for #{v_name} is invalid") unless send("valid_#{v_name}?")
-      end
-    end
+    private
 
     def valid_mass?
-      !mass.nil? && mass.is_a?(Float)
+      !mass.nil? && mass.is_a?(Numeric)
     end
 
     def valid_pairs?
       !pairs.empty?
     end
 
-    def valid_directives_sequential?
-      !directives_sequential
+    def valid_order?
+      !order
     end
 
-    def directives_sequential?
-      directive = nil
+    # you can only calculate if directives passed in right order - :launch->:land
+    def define_order
+      dir = nil
       pairs.map do |pair|
-        return true if directive == pair.directive
+        return true if dir == pair.directive
 
-        directive = pair.directive
+        dir = pair.directive
       end
       false
     end

data/lib/fuelator/parameters/pair.rb

@@ -1,7 +1,9 @@
 module Fuelator
   class Parameters
     class Pair
+      include Validator
       DIRECTIVES = [:launch, :land]
+
       attr_reader :directive, :gravity
 
       def initialize(pair)
@@ -11,19 +13,12 @@ module Fuelator
         validate!
       end
 
-      def validate!
-        instance_variables.each do |v|
-          v_name = v.to_s.gsub(/^@/, '')
-          raise Error.new("value for #{v_name} is invalid") unless send("valid_#{v_name}?")
-        end
-      end
-
       def valid_directive?
-        Pair::DIRECTIVES.include?(directive) && directive.is_a?(Symbol)
+        DIRECTIVES.include?(directive) && directive.is_a?(Symbol)
       end
 
       def valid_gravity?
-        !gravity.nil? && gravity.is_a?(Float)
+        !gravity.nil? && gravity.is_a?(Numeric)
       end
     end
   end

data/lib/fuelator/parameters/validator.rb

@@ -0,0 +1,15 @@
+module Fuelator
+  class Parameters
+    module Validator
+
+      # runs #valid_[variable]? method for every instance variable
+      # raises Error defined in parent namespace
+      def validate!
+        instance_variables.each do |v|
+          v_name = v.to_s.gsub(/^@/, '')
+          raise Error.new("value for #{v_name} is invalid") unless send("valid_#{v_name}?")
+        end
+      end
+    end
+  end
+end

data/lib/fuelator/version.rb

@@ -1,3 +1,3 @@
 module Fuelator
-  VERSION = "0.1.6"
+  VERSION = "0.1.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fuelator
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.9
 platform: ruby
 authors:
 - Sergii Brytiuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-24 00:00:00.000000000 Z
+date: 2020-07-26 00:00:00.000000000 Z
 dependencies: []
 description: |-
   The goal of this application is to calculate fuel
@@ -18,7 +18,7 @@ email:
 - brytiuk076@gmail.com
 executables:
 - console
-- fuelator
+- fuelator.rb
 - setup
 extensions: []
 extra_rdoc_files: []
@@ -33,12 +33,14 @@ files:
 - README.md
 - Rakefile
 - bin/console
-- bin/fuelator
+- bin/fuelator.rb
 - bin/setup
 - fuelator.gemspec
 - lib/fuelator.rb
+- lib/fuelator/calc.rb
 - lib/fuelator/parameters.rb
 - lib/fuelator/parameters/pair.rb
+- lib/fuelator/parameters/validator.rb
 - lib/fuelator/version.rb
 homepage: https://github.com/645383/fuelator
 licenses:

data/bin/fuelator

@@ -1,45 +0,0 @@
-#!/usr/bin/env ruby
-
-require "fuelator"
-require 'optionparser'
-
-def log(object)
-  STDERR.puts object
-end
-
-verbose = false
-
-optparse = OptionParser.new do |opts|
-  opts.banner = "Usage: fuelator [args]"
-
-  opts.separator "Args sample: 28801 launch 9.807 land 1.62 launch 1.62 land 9.807"
-  opts.separator "Where 28801 - flight ship mass"
-  opts.separator "directive/gravity pairs:"
-  opts.separator "      launch - flight directive"
-  opts.separator "      1.62 -  target planet gravity"
-  opts.separator "Add as many directive/gravity pairs as you wish. Note, you can not pass 2 same directives in a sequence."
-
-  opts.on("-v", "--verbose", "Verbose mode") do |v|
-    verbose = v
-  end
-end
-optparse.parse!
-
-def run(params, verbose)
-  if params.count == 0
-    log("run `fuelator -h` for help")
-    return
-  end
-  result = Fuelator.calculate(params)
-  log "#{result.to_i} kg"
-rescue Fuelator::Parameters::Error, StandardError => e
-  log_error(e, verbose)
-end
-
-def log_error(e, verbose)
-  log e
-  log e.backtrace if verbose
-  false
-end
-
-exit 1 unless run ARGV, verbose