temperature_converter_EmielEst 1.0.11 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 150296809ca1f1ae5135a46a676728471e72f350
-  data.tar.gz: f567f1fa6e24cf9b9c2b7534d53f034107d440a3
+  metadata.gz: 0aa51d13e77927ce6e3d525547e1feb718e72444
+  data.tar.gz: cc43fe0bc3f17d2dfe53279ee2d70218d2270722
 SHA512:
-  metadata.gz: 2f7fb230818a45e5dfbf0e921ed8052261611c713a139c1257367dfc3626c390bfad1f9e5b15b54f288ebe558450b8ef85576bee5c3de60acfdd97ebc6887b79
-  data.tar.gz: 1b2518461047c083d424e3defe88eb6b0610dcfe6eaaf9ba1e8d4d0506b0e26e6d01f39d170a17c3b2b037c9ab991d66287823247930d78fcd82b2c647850a14
+  metadata.gz: f28bcf86b5ca39d6fadf2ee731f63051f4ccc9be900994af6fe3025bfce7e14c8fca504f80383aa6601a99f616737c98656d30586be425c150645d4658f42992
+  data.tar.gz: f818556b4b546b11979b73b04ee6a46280463faea78d3c1bd90b2919d9d175b80e7b54db991e3b43b6c973ab11922ec580d364af9c93063a199276689027b13d

data/bin/temp-conv

@@ -12,8 +12,8 @@ require 'html_printer.rb'
 require 'mqtt_reader.rb'
 
 globalTemperature = 0
-path = 'C:\Users\Gebruiker\Documents\School\systeem\Oefenigen\01 Temp converter\temperatuur.txt'
-link = 'http://labict.be/software-engineering/temperature/api/temperature/fake'
+path = 'C:\temperatuur.txt'
+link = 'https://labict.be/software-engineering/temperature/api/temperature/fake'
 
 
 OptionParser.new do |opts|
@@ -28,7 +28,7 @@ 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)
+    c = TextReader.open_file(path)
   end
 
   #temperatuur uit URL
@@ -38,40 +38,36 @@ end
   end
 
   #temperatuur uit cmd
-  opts.on("-c", "--command", String, "enter your temperature") do |temperature|
-
-    puts "temperature from command window"
-    c = temperature.to_f
+  opts.on("-c", "--commandline temperature", String, "enter your temperature" ) do |commandlineTemperature|
+    # puts "temperature #{mijnStringetje}";
+    c = commandlineTemperature.to_f
+    puts 'here you see your temperature you entered'
+    puts c
   end
 
   #temperatuur uit qtmt
 
   opts.on("-m","--mqtt", "temperature van mqtt") do
-
-    # 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 mqtttemperature = JSON.parse(message)['fields']['temperature']
     mqtttemperature = MqttReader.read()
     c = mqtttemperature.to_f
   end
 
-  f = TempConverter.calc_fahr(c)
-  k = TempConverter.calc_kelvin(c)
+
 
   #Tweede opts om de text te printen naar volgens de voorwaarde
   opts.on("--text", "temperature in plain text" ) do
+    f = TempConverter.calc_fahr(c)
+    k = TempConverter.calc_kelvin(c)
     TextPrinter.print(c, f, k)
   end
   opts.on("--json", "temperature in JSON-string" ) do
+    f = TempConverter.calc_fahr(c)
+    k = TempConverter.calc_kelvin(c)
     JsonPrinter.print(c, f, k)
   end
   opts.on("--html", "temperature in html format" ) do
+    f = TempConverter.calc_fahr(c)
+    k = TempConverter.calc_kelvin(c)
     HtmlPrinter.print(c, f, k)
   end
 end.parse!

data/lib/mqtt_reader.rb

@@ -1,4 +1,4 @@
-require 'MQTT'
+require 'mqtt'
 class MqttReader
 def self.read()
   client = MQTT::Client.new

data/lib/temp_converter.rb

@@ -1,18 +1,18 @@
-require 'text_reader.rb'
-require 'url_reader.rb'
-require 'text_printer.rb'
-require 'json_printer.rb'
-require 'html_printer.rb'
+# require 'text_reader.rb'
+# require 'url_reader.rb'
+# require 'text_printer.rb'
+# require 'json_printer.rb'
+# require 'html_printer.rb'
 
 class TempConverter
 
 
 
-  def self.to_print_all(c, f, k)
-    TextPrinter.print(c, f, k)
-    JsonPrinter.print(c, f, k)
-    HtmlPrinter.print(c, f, k)
-  end
+  # def self.to_print_all(c, f, k)
+  #   TextPrinter.print(c, f, k)
+  #   JsonPrinter.print(c, f, k)
+  #   HtmlPrinter.print(c, f, k)
+  # end
 
   def self.calc_kelvin(t)
     return (t + 273.15)
@@ -22,31 +22,31 @@ class TempConverter
     return ((t*9/5)+32)
   end
 
-  def self.commandline_temperature(temp)
-    puts "Temperatuur uit powershell"
-    kelvin = calc_kelvin(temp)
-    fahr = calc_fahr(temp)
-    to_print_all(temp, fahr, kelvin)
-  end
-
-  def self.url_temperature(link)
-    puts "Temperatuur uit url"
-    temp = UrlReader.open_url(link)
-    kelvin = calc_kelvin(temp)
-    fahr = calc_fahr(temp)
-    to_print_all(temp, fahr, kelvin)
-  end
-
-  def self.file_temperature(file_name)
-    puts "Temperatuur uit textdocument"
-    temp = TextReader.open_file(file_name)
-    kelvin = calc_kelvin(temp)
-    fahr = calc_fahr(temp)
-    to_print_all(temp, fahr, kelvin)
-  end
-
-  def self.get_file_temperature(file_name)
-    return TextReader.open_file(file_name)
-  end
+  # def self.commandline_temperature(temp)
+  #   puts "Temperatuur uit powershell"
+  #   kelvin = calc_kelvin(temp)
+  #   fahr = calc_fahr(temp)
+  #   to_print_all(temp, fahr, kelvin)
+  # end
+  #
+  # def self.url_temperature(link)
+  #   puts "Temperatuur uit url"
+  #   temp = UrlReader.open_url(link)
+  #   kelvin = calc_kelvin(temp)
+  #   fahr = calc_fahr(temp)
+  #   to_print_all(temp, fahr, kelvin)
+  # end
+  #
+  # def self.file_temperature(file_name)
+  #   puts "Temperatuur uit textdocument"
+  #   temp = TextReader.open_file(file_name)
+  #   kelvin = calc_kelvin(temp)
+  #   fahr = calc_fahr(temp)
+  #   to_print_all(temp, fahr, kelvin)
+  # end
+  #
+  # def self.get_file_temperature(file_name)
+  #   return TextReader.open_file(file_name)
+  # end
 
 end

data/lib/temperature_converter_EmielEst.rb

@@ -1,6 +1,4 @@
 require 'text_reader.rb'
-require 'MQTT'
-require 'mqtt_reader.rb'
 require 'url_reader.rb'
 require 'text_printer.rb'
 require 'json_printer.rb'
@@ -8,6 +6,9 @@ require 'html_printer.rb'
 require 'temp_converter.rb'
 require 'net/http'
 require 'uri'
+require 'net/http'
 require 'rubygems'
+require 'mqtt'
 require 'json'
 require 'optparse'
+require 'mqtt_reader.rb'

data/lib/url_reader.rb

@@ -1,3 +1,7 @@
+require 'net/http'
+
+require 'uri'
+
 class UrlReader
 
   def self.open_url(url)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: temperature_converter_EmielEst
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.2.0
 platform: ruby
 authors:
 - Emiel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-23 00:00:00.000000000 Z
+date: 2016-12-24 00:00:00.000000000 Z
 dependencies: []
 description: Use commands to convert temperatures from different sources
 email: emiel.estievenart@student.vives.be
@@ -46,7 +46,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.5.2
 signing_key: 
 specification_version: 4
 summary: Easy commands to convert temperatures