temperature_converter_EmielEst 1.0.2 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c7d65fab9f6da1840c02fb5a04d34b18a7e9190
-  data.tar.gz: 6e5716d283d507b637b0c1e5e7fafc77247d1f1c
+  metadata.gz: bf534fae36c281ff2e5b27012067023d05802e3c
+  data.tar.gz: 2156af2dee2520dea6dc6e0562c88639adad34f8
 SHA512:
-  metadata.gz: d8ddbf9fe4914240c13783ead3029915f98b5b9180d19e612e85bca28539cdb45b309a345e3b0fb66a5d92a1b1a8290eb1b11b84e66126a1716a5418f737918a
-  data.tar.gz: d0f9583af0318f5b1cdaacb6a72c3cfe810bdbe953ed9c3036308936bef1994e883fcfe8d2ed6e04854b5a8fb09d050a39db81c0e2615cb4d2de2cd75e6a40f1
+  metadata.gz: 712dcde4025707df2d0ee2fddec3a2fe43eb86fab491fa961d49cfe7c4035845349ea133c99d0a1072bbd04ec75160024d197931f5d96be86214ff622071d5b9
+  data.tar.gz: 3f25ca472672c6502ca7b7f193cd848287255d5d82a50a88cccd7c36a33d0535826449293e66fff1e13a3ea5a4cfcc143176fa6c0dc038462bfba46e86763cb5

data/bin/temp-conv

@@ -1,6 +1,3 @@
-#!/usr/bin/env ruby
-
-require 'temperature_converter_EmielEst'
 require 'temp_converter.rb'
 require 'net/http'
 require 'uri'
@@ -13,6 +10,7 @@ require 'url_reader.rb'
 require 'text_printer.rb'
 require 'json_printer.rb'
 require 'html_printer.rb'
+require "mqtt_reader.rb"
 
 globalTemperature = 0
 path = 'C:\Users\Gebruiker\Documents\School\systeem\Oefenigen\01 Temp converter\temperatuur.txt'
@@ -20,91 +18,61 @@ link = 'http://labict.be/software-engineering/temperature/api/temperature/fake'
 
 
 OptionParser.new do |opts|
+  c = 0
   opts.banner = "Usage: ruby app.rb [options]"
+
+opts. on("-h","--help", "dispay all opts") do
+  puts opts
+  exit
+end
+
   #temperatuur uit file
   opts.on("-file", "string file directory" ) do
     puts "this is the temperature from your file"
     c = TempConverter.get_file_temperature(path)
-    f = TempConverter.calc_fahr(c)
-    k = TempConverter.calc_kelvin(c)
-    #Tweede opts om de text te printen naar volgens de voorwaarde
-    opts.on("-Text", "enter your file directory" ) do
-      TextPrinter.print(c, f, k)
-    end
-    opts.on("-Json", "enter your file directory" ) do
-      JsonPrinter.print(c, f, k)
-    end
-    opts.on("-Html", "enter your file directory" ) do
-      HtmlPrinter.print(c, f, k)
-    end
   end
 
   #temperatuur uit URL
   opts.on("-url", "link to temperature") do
     puts "temperature from link"
     c = UrlReader.open_url(link)
-    f = TempConverter.calc_fahr(c)
-    k = TempConverter.calc_kelvin(c)
-    #Tweede opts om de text te printen naar volgens de voorwaarde
-    opts.on("-Text", "enter your file directory" ) do
-      TextPrinter.print(c, f, k)
-    end
-    opts.on("-Json", "enter your file directory" ) do
-      JsonPrinter.print(c, f, k)
-    end
-    opts.on("-Html", "enter your file directory" ) do
-      HtmlPrinter.print(c, f, k)
-    end
   end
 
   #temperatuur uit cmd
-  opts.on("-t", "--string temperature", String, "enter your temperature") do |temperature|
+  opts.on("-c", "--command", String, "enter your temperature") do |temperature|
 
     puts "temperature from command window"
     c = temperature.to_f
-    f = TempConverter.calc_fahr(c)
-    k = TempConverter.calc_kelvin(c)
-    #Tweede opts om de text te printen naar volgens de voorwaarde
-    opts.on("-Text", "enter your file directory" ) do
-      TextPrinter.print(c, f, k)
-    end
-    opts.on("-Json", "enter your file directory" ) do
-      JsonPrinter.print(c, f, k)
-    end
-    opts.on("-Html", "enter your file directory" ) do
-      HtmlPrinter.print(c, f, k)
-    end
   end
 
   #temperatuur uit qtmt
 
-  opts.on("-m", "--temperature van mqtt") do
+  opts.on("-m","--mqtt", "temperature van mqtt") do
 
-    client = MQTT::Client.new
-    client.host = 'staging.thethingsnetwork.org'
-    client.port = '1883'
-    client.username = '70B3D57ED00012B2'
-    client.password = 'c8iuTSccnypK1eoFzEb/OoqB2FVAiFg/aEaYesnNf4w='
-    client.connect
-    client.get('70B3D57ED00012B2/devices/000000007DD44BFC/up') do |topic,message|
-    puts tuid = JSON.parse(message)['fields']['temperature']
-    puts topic
-    c = tuid.to_f
+    # client.host = 'staging.thethingsnetwork.org'
+    # client.port = '1883'
+    # client.username = '70B3D57ED00012B2'
+    # client.password = 'c8iuTSccnypK1eoFzEb/OoqB2FVAiFg/aEaYesnNf4w='
+    # client.connect
+    # c = 0
+    # topic, message=client.get('70B3D57ED00012B2/devices/00000000AE6C63E4/up')
+    #
+    # puts tuid = JSON.parse(message)['fields']['temperature']
+    mqttTemperature = MqttReader.read()
+    c = mqttTemperature.to_f
+  end
 
-    puts "temperature from command window"
+  f = TempConverter.calc_fahr(c)
+  k = TempConverter.calc_kelvin(c)
 
-    f = TempConverter.calc_fahr(c)
-    k = TempConverter.calc_kelvin(c)
-    #Tweede opts om de text te printen naar volgens de voorwaarde
-    opts.on("-Text", "enter your file directory" ) do
-      TextPrinter.print(c, f, k)
-    end
-    opts.on("-Json", "enter your file directory" ) do
-      JsonPrinter.print(c, f, k)
-    end
-    opts.on("-Html", "enter your file directory" ) do
-      HtmlPrinter.print(c, f, k)
-    end
+  #Tweede opts om de text te printen naar volgens de voorwaarde
+  opts.on("--text", "temperature in plain text" ) do
+    TextPrinter.print(c, f, k)
+  end
+  opts.on("--json", "temperature in JSON-string" ) do
+    JsonPrinter.print(c, f, k)
   end
+  opts.on("--html", "temperature in html format" ) do
+    HtmlPrinter.print(c, f, k)
   end
 end.parse!

data/lib/mqtt_reader.rb

@@ -0,0 +1,14 @@
+class MqttReader
+def self.read()
+  client = MQTT::Client.new
+  client.host = 'staging.thethingsnetwork.org'
+  client.port = '1883'
+  client.username = '70B3D57ED00012B2'
+  client.password = 'c8iuTSccnypK1eoFzEb/OoqB2FVAiFg/aEaYesnNf4w='
+  client.connect
+  c = 0
+  topic, message=client.get('70B3D57ED00012B2/devices/00000000AE6C63E4/up')
+
+  return JSON.parse(message)['fields']['temperature']
+end
+end

data/lib/temperature_converter_EmielEst.rb

@@ -4,6 +4,7 @@ require 'text_printer.rb'
 require 'json_printer.rb'
 require 'html_printer.rb'
 require 'temp_converter.rb'
+require "mqtt_reader.rb"
 require 'net/http'
 require 'uri'
 require 'rubygems'

data/lib/text_printer.rb

@@ -1,7 +1,6 @@
 class TextPrinter
-  #Prints all 3 temperatures. 
+  #Prints all 3 temperatures.
   def self.print(celsius,fahrenheit, kelvin)
-      puts "Temperatuur: "
       puts "#{celsius} °C"
       puts  "#{fahrenheit} °F"
       puts "#{kelvin} °K"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: temperature_converter_EmielEst
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.5
 platform: ruby
 authors:
 - Emiel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-18 00:00:00.000000000 Z
+date: 2016-12-23 00:00:00.000000000 Z
 dependencies: []
 description: Use commands to convert temperatures from different sources
 email: emiel.estievenart@student.vives.be
@@ -20,6 +20,7 @@ files:
 - bin/temp-conv
 - lib/html_printer.rb
 - lib/json_printer.rb
+- lib/mqtt_reader.rb
 - lib/temp_converter.rb
 - lib/temperature_converter_EmielEst.rb
 - lib/text_printer.rb