te_reo_maori 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15f1388c18d6a441b6fd21c1ce469812ba9699ae0d077652810a123a3f02d7c2
-  data.tar.gz: ce16604c09f8dc6cd936af662947675086e41c08ada7588a9f2c4e0aab5a03b8
+  metadata.gz: e9c4d305f849d2fb625c6d34cf88e0bf45ef333ae788ab8ae68fb997208582e8
+  data.tar.gz: 8d9ebc46de387bf2423bd5442e9645de57f0e07ca4ea25606c36a57135157c6c
 SHA512:
-  metadata.gz: d7f8c9574ed5707599ffb943c159d833018678a3bbf83d4efdb6e7411b84eca56585ba9b40a30299b2eb5bb718767e08006ce6dbb693fb2071d88ee2172a0d23
-  data.tar.gz: 226301514fb751764e133fff9def65574c5eb288218c2da2d353567511ef09776328863c598d21bab2757a8b3310f9d7cea19a241fb9e8d0f1b54fe1bb5223f4
+  metadata.gz: 89addf2f4b6d484bc4fb1d2def719d61019de90846a1a929b42cefff1f40a80a1d317bf3430b6dcbf3a822e3a3a5a0242916425fce225cf2ce4717b46260207f
+  data.tar.gz: 336ff0c1fbaf7b977e8ad8e35dfbccf70e8f9eb09c63dd45646d3d2a9858df88c0343d6527d79cd92404e1e2eddb77fb7a1ba650d6d10ac08e6b50979051790f

data/.gitlab-ci.yml

@@ -1,8 +1,28 @@
 image: ruby:2.6
 
-before_script:
-  - bundle install
-
 test:
+  before_script:
+    - bundle install
   script:
     - rake
+
+include:
+  - template: Code-Quality.gitlab-ci.yml
+
+docker_build:
+  variables:
+    # Use TLS https://docs.gitlab.com/ee/ci/docker/using_docker_build.html#tls-enabled
+    DOCKER_HOST: tcp://docker:2376
+    DOCKER_TLS_CERTDIR: "/certs"
+  stage: deploy # Part of a later stage
+  services:
+    - docker:19.03.5-dind
+  image: docker:19.03.5
+  script:
+    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+    - docker pull --quiet $CI_REGISTRY_IMAGE:latest || true
+    - docker build -t $CI_REGISTRY_IMAGE:latest .
+    - docker push $CI_REGISTRY_IMAGE:latest
+  only:
+    - master
+  needs: ["test"]

data/ChangeLog

@@ -1 +1,2 @@
+* v 0.1.1 Has docker image. Handle up to 99
 * v 0.1.0 Handles numbers 1-19

data/Dockerfile

@@ -0,0 +1,10 @@
+FROM ruby:2.6
+MAINTAINER Samuel Garratt
+
+RUN mkdir /app
+WORKDIR /app
+COPY . /app
+RUN gem install bundler
+RUN bundle install
+
+ENTRYPOINT ["ruby", "exe/te_reo_maori"]

data/exe/te_reo_maori

@@ -5,4 +5,19 @@ require 'irb'
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require 'te_reo_maori'
 
+def putanga
+  exit
+end
+
+extend Tau # Make numbers available
+
+puts 'Nau mai haere mai. Welcome to this application for learning and interacting with Maori.'
+puts 'Type "putanga" to exit'
+puts 'Try and perform +, -, * (times), / (divide) with Maori'
+puts 'The numbers are: '
+Tau.rarangi.each do |tau, whakamaoritanga|
+  puts "#{tau}: #{whakamaoritanga}"
+end
+puts 'Example of bigger numbers. 12: (tekau ma rua). Add 23 + 33: (rua tekau ma toru) + (toru tekau ma toru)  '
+
 IRB.start(__FILE__)

data/lib/te_reo_maori/tau.rb

@@ -1,49 +1,70 @@
 # frozen_string_literal: true
 
-class Tau < Integer
-end
+# Number in Maori
+module Tau
+  # List numbers
+  def self.rarangi
+    {
+        1 => 'tahi', 2 => 'rua', 3 => 'toru', 4 => 'wha', 5 => 'rima', 6 => 'ono', 7 => 'waru',
+        8 => 'iwa', 10 => 'tekau'
+    }
+  end
 
-def tahi
-  1
-end
+  def digit(tau, second_digit)
+    return tau if second_digit.nil?
 
-def rua
-  2
-end
+    ((tau - 1) * 10) + second_digit
+  end
 
-def toru
-  3
-end
+  # 1
+  def tahi
+    1
+  end
 
-def wha
-  4
-end
+  # 2
+  def rua(second_digit = nil)
+    digit(2, second_digit)
+  end
 
-def rima
-  5
-end
+  # 3
+  def toru(second_digit = nil)
+    digit(3, second_digit)
+  end
 
-def ono
-  6
-end
+  # 4
+  def wha(second_digit = nil)
+    digit(4, second_digit)
+  end
 
-def whitu
-  7
-end
+  # 5
+  def rima(second_digit = nil)
+    digit(5, second_digit)
+  end
 
-def waru
-  8
-end
+  # 6
+  def ono(second_digit = nil)
+    digit(6, second_digit)
+  end
 
-def iwa
-  9
-end
+  def whitu(second_digit = nil)
+    digit(7, second_digit)
+  end
 
-def tekau(extra_digit = nil)
-  extra_digit ? 10 + extra_digit : 10
-end
+  def waru(second_digit = nil)
+    digit(8, second_digit)
+  end
+
+  def iwa(second_digit = nil)
+    digit(9, second_digit)
+  end
+
+  # 10. Used to add groups of 10
+  def tekau(extra_digit = nil)
+    extra_digit ? 10 + extra_digit : 10
+  end
 
-# Add extra digit
-def ma(extra_digit)
-  extra_digit
+  # Add extra digit
+  def ma(extra_digit)
+    extra_digit
+  end
 end

data/lib/te_reo_maori/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TeReoMaori
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: te_reo_maori
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Samuel Garratt
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-17 00:00:00.000000000 Z
+date: 2020-09-18 00:00:00.000000000 Z
 dependencies: []
 description: Tool to aid one to learn Maori and enable one to program in Maori.
 email:
@@ -23,6 +23,7 @@ files:
 - ".rspec"
 - CODE_OF_CONDUCT.md
 - ChangeLog
+- Dockerfile
 - Gemfile
 - LICENSE.txt
 - README.md