alex-vancoillie-thermostat-exercise 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44691d1cc301238ea4a0c1a4519dd3b117679652
-  data.tar.gz: 9e249369bbc0081385bb67d7438a4e0adf8c2e43
+  metadata.gz: 99a32209873e3c93cf857588d1940a1378ddc488
+  data.tar.gz: 5226dfee78fd0df73188ddbb53ab771ef5763c02
 SHA512:
-  metadata.gz: 53c586e0329bf20a39370b7ebae76614c9dc079a97dd57fe379308e45d38d0b852c87c43e77140867739d7ebee279e634c72cc0be4de49354488764b0d940e59
-  data.tar.gz: ddd2de5b5f7e0992d1aef1a45e09c24a7ecf4111077bc4e53ce8cf712e9eecaee19b250a045ef645c243e33fb06f015468f68b86ab97ec627cb021c684be5413
+  metadata.gz: dee68ce75dbbe4bce299376a625596ff13ab05191d9b7b9aad24de75504e800e8c41ec633b8ddf232704f3a83b3f0bb73ed517dc2cece4dc32b445e1212ba786
+  data.tar.gz: 5f5df345dae12b0a628663c8cb3b32720a9289ad31bcd1e4e3e8891a756389de0ede5796f9e3ae9884e67b88119f2bcbb6ced950c30eda0ce0514a218e494086

data/bin/app

@@ -21,20 +21,20 @@ optparse = OptionParser.new do |opts|
     opts.banner = "Usage: app.rb [options]"
 
     # define the options, and what they do
-    opts.on('-m', '--method M', String, 'How to get temperature [user], [url], [mqtt]') do |method|
+    opts.on('-m', '--method M', String, 'How to get temperature [user], [command], [url], [mqtt]') do |method|
         options[:method] = method
     end
 
     opts.on('-c', '--celsius TEMP', Float, 'Enter the temperature in Celsius') do |celsius|
-        options[:temperature] = temp.convert('c', celsius)
+        options[:temperature] = temp.convert(celsius, 'C')
     end
 
     opts.on('-k', '--kelvin TEMP', Float, 'Enter the temperature in Kelvin') do |kelvin|
-        options[:temperature] = temp.convert('k', kelvin)
+        options[:temperature] = temp.convert(kelvin, 'K')
     end
 
     opts.on('-f', '--fahrenheit TEMP', Float, 'Enter the temperature in Fahrenheit') do |fahrenheit|
-        options[:temperature] = temp.convert('f', fahrenheit)
+        options[:temperature] = temp.convert(fahrenheit, 'F')
     end
 
     opts.on('-r', '--range R', Float, 'Enter the range') do |range|
@@ -69,6 +69,21 @@ if options[:method] == 'user'
     log.addContent(led.get_fcolor)
 end
 
+if options[:method] == 'command'
+    conversion = temp.convert(options[:temperature], options[:unit])
+    puts "The converted temperature in celsius: #{conversion} "
+    led.check_led(conversion, options[:set], options[:range])
+    relais.set(conversion, options[:set], options[:range])
+
+    puts relais.get_heating
+    puts relais.get_cooling
+    puts led.get_led
+
+    log.addContent(relais.get_heating)
+    log.addContent(relais.get_cooling)
+    log.addContent(led.get_fcolor)
+end
+
 if options[:method] == 'url'
     update = Thread.new do
 

data/lib/led.rb

@@ -1,6 +1,7 @@
 require 'colorize'
 
 class Led
+    # this method will define which color the LED should be
     def check_led(temp, set, range)
         if(temp < (set - range))
             @color = "0000FF".colorize(:blue)
@@ -14,14 +15,17 @@ class Led
         end
     end
 
+    # this method is used for the output if you run the program
     def get_led
         "The LED is #{@color}"
     end
 
+    # this method is used to publish ONLY the hexadecimal value to the RGB-LED
     def get_color
         return @fcolor
     end
 
+    # this method is used to write the output to the log.txt file
     def get_fcolor
         "The LED is #{@fcolor}"
     end

data/lib/log.rb

@@ -5,6 +5,7 @@ class Log
         @file = "log.txt"
     end
 
+    # this method will define what data needs to be stored in the log.txt file
     def addContent(content)
         date = Time.now.strftime("%d/%m/%Y %H:%M")
         File.open(@file, 'a+') do |file|

data/lib/relais.rb

@@ -1,4 +1,5 @@
 class Relais
+    # this method will define if the heating and/or the cooling should be enabled
     def set(temp, set, range)
         if temp < (set - range)
             @heating = true
@@ -12,10 +13,12 @@ class Relais
         end
     end
 
+    # this method tells you if the heating is enabled or not
     def get_heating
         "The heating is #{@heating}"
     end
 
+    # this method tells you if the cooling is enabled or not
     def get_cooling
         "The cooling is #{@cooling}"
     end

data/lib/temperature.rb

@@ -1,11 +1,10 @@
 class Temperature
+    # this method will convert the temperature to Celsius
     def convert(temp, unit)
         if(unit == "C")
             @temp = temp
         elsif(unit == "K")
-            # normally it need to be '273.15', but if we do this the led will never
-            # be "green"
-            @temp = temp - 273
+            @temp = temp - 273.15
         elsif(unit == "F")
             @temp = ((temp - 32) * 5 / 9)
         else

data/lib/transport.rb

@@ -2,6 +2,7 @@ require 'mqtt'
 require 'json'
 
 class Transport
+    # this method will automatically subscribe through MQTT from an mbed
     def get_connection
         puts "MQTT:"
         temperature_topic = 'softwareengineering/thermostat/cfbnik/temperature'
@@ -21,6 +22,7 @@ class Transport
         @on_change_block = block
     end
 
+    # this method will publish its value through MQTT to an mbed
     def send_color(color)
         connection = MQTT::Client.connect('mqtt.labict.be')
         my_hash = {"color" => color}

data/lib/user_input.rb

@@ -1,4 +1,5 @@
 class UserInput
+    # this method will ask the user four questions
     def askData
         puts "Enter the temperature:"
         @temp = gets.chomp.to_f
@@ -13,18 +14,22 @@ class UserInput
         @range = gets.chomp.to_f
     end
 
+    # this method will give us the temperature
     def get_temp
         return @temp
     end
 
+    # this method will give us the wanted temperature
     def get_set
         return @set
     end
 
+    # this method will give us the unit
     def get_unit
         return @unit
     end
 
+    # this method will give us the range
     def get_range
         return @range
     end

data/lib/web.rb

@@ -4,6 +4,7 @@ require 'open-uri'
 OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE
 
 class Web
+    # this method will give us the current temperature through a URL
     def url
         @temp = (URI.parse("https://labict.be/software-engineering/temperature/api/temperature/fake").read).to_f
         puts @temp

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alex-vancoillie-thermostat-exercise
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Alex Vancoillie
@@ -9,8 +9,22 @@ autorequire:
 bindir: bin
 cert_chain: []
 date: 2017-05-09 00:00:00.000000000 Z
-dependencies: []
-description: A thermostat gem
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: A thermostat gem (small application exercise)
 email: alex.vancoillie@student.vives.be
 executables:
 - app