number_station 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 377a40f8d4aaf4f86503a468bcbb133b10b738d4553e5da6849490150ce41b98
-  data.tar.gz: 0ba471edeabe6cee234897cc18913aacad818417c39bc5cbc7c5e639e7af6c1e
+  metadata.gz: 9ffaf0a85087f356cdd5227039ec8731ff0a89d9cdf7e2a5020bb53cc0be74a6
+  data.tar.gz: 88c9c3a558e45684db5f85e0bf32c02ab55b026f146b6b5d2c2816fa6d01f21c
 SHA512:
-  metadata.gz: cd740ab71dc7da9f01d81e844c7a71fa6ba5afa6c02eb332f3eb995f71fe6b768617f73149c625b3d0e9d5f1833cc7d0221a66b8f9f13233eeca0b17f89246f8
-  data.tar.gz: 21d407d3f8db3aa68dfc81265235553d39f6474c96bbdc483960d31396043a12a3d724319b2fc80ccef5de7cbed4227a68847e00b71738d4daf8d17ce71f7ec9
+  metadata.gz: a7757a314e15e2fda90ec3689ff63fa45e93a1e0e840c3c3c1a8e8313bb86a6b98acfa464f6ad2c3ed8f15dfbc4f26433fc8bdd2c0ee7795266bd177a81d9632
+  data.tar.gz: 9e7885c467a9804e10ae8d478e4ee8d5253c999e8e9fdbc6fef0c632ee182689c48a7184e9897f6245182d38b3e66335f1214dfc33874bb159e55c61d1a025d0

data/lib/number_station/GLaDOS_espeak.rb

@@ -0,0 +1,36 @@
+def template(word)
+  sign = randomsign() || ""
+  return "<prosody pitch=\"#{sign + rand(0..80).to_s}\">#{word}</prosody>"
+end
+
+def randomsign()
+  rnum = rand(0..1)
+
+  if rnum == 0
+    return "-"
+  else
+    return "+"
+  end
+end
+
+
+message = "This was a triumph! I'm making a note here, huge success."
+
+words = message.split(" ")
+sentence = "<speak version=\"1.0\" xmlns=\"\" xmlns:xsi=\"\" xsi:schemaLocation=\"\" xml:lang=\"\"><voice gender=\"female\">"
+sentenceend = "</voice></speak>"
+
+words.each do |i|
+  sentence += template(i)
+end
+
+final = sentence + sentenceend
+
+
+filename = "GLaDOS_espeak_config.xml"
+f = File.open(filename, "w")
+f.write(final)
+f.close
+
+cmd = "espeak -ven+f3 -m -p 60 -s 180 -f #{filename}"
+`#{cmd}`

data/lib/number_station/cli.rb

@@ -24,76 +24,83 @@ require 'fileutils'
 
 module NumberStation
   class CLI < Thor
-    
+
 
     # create_config
     desc "create_config [--path PATH]", "copy the sample config to current directory."
     long_desc <<-CREATE_CONFIG_LONG_DESC
       `create_config` will copy the sample config from config/config.json to the current directory. If the
-      optional parameter `--path PATH` is passed then this file is copied to the location specified by the 
+      optional parameter `--path PATH` is passed then this file is copied to the location specified by the
       PATH parameter.
+      Sample Intro and Outro messages are also copied to this directory. If you wish to automatically append
+      these messages, change the conf.json boolean.
     CREATE_CONFIG_LONG_DESC
     option :path, :type => :string
     def create_config()
+      config_file_path = File.join(File.dirname(__FILE__), "../../resources/conf.json")
+      intro_file_path = File.join(File.dirname(__FILE__), "../../resources/intro_message.txt")
+      outro_file_path = File.join(File.dirname(__FILE__), "../../resources/outro_message.txt")
+
+      options[:path] ? path = options[:path] : path = File.join(Dir.home, "/number_station")
+
+      unless Dir.exist?(path) then FileUtils.mkdir(path) end
+      unless File.file?(File.join(path, "conf.json")) then FileUtils.cp(config_file_path, File.join(path, "conf.json")) end
+      unless File.file?(File.join(path, "intro_message.txt")) then FileUtils.cp(intro_file_path, File.join(path, "intro_message.txt")) end
+      unless File.file?(File.join(path, "outro_message.txt")) then FileUtils.cp(outro_file_path, File.join(path, "outro_message.txt")) end
       NumberStation::ConfigReader.read_config()
-      config_file_path = File.join(File.dirname(__FILE__), "../../config/conf.json")
-
-      if options[:path]
-        path = options[:path]
-        unless File.file?(File.join(path, "/conf.json"))
-          #write config to path
-          NumberStation.log.debug "Copying sample config to #{path}"
-          FileUtils.cp(config_file_path, path)
-        else
-          NumberStation.log.debug "File already exists at #{File.join(path, "/conf.json")}"
-        end
-      else
-        path = Dir.pwd
-        unless File.file?(File.join(path, "/conf.json"))
-          #write config to local directory the binary was called from
-          NumberStation.log.debug "Copying sample config to #{path}"
-          FileUtils.cp(config_file_path, path)
-        else
-          NumberStation.log.debug "File already exists at #{File.join(path, "/conf.json")}"
-        end
-      end
+      NumberStation.log.debug "create_config completed"
     end
 
 
     # convert_to_phonetic
-    desc "convert_to_phonetic [MESSAGE]", "Convert a message to phonetic output."
+    desc "convert_to_phonetic [MESSAGE_PATH]", "Convert a message to phonetic output."
     long_desc <<-CONVERT_MESSAGE_LONG_DESC
       convert_message takes a parameter which should point to a text file containing a message.
+        MESSAGE_PATH\n
       Optional parameters:\n
-        MESSAGE\n
-        --intro [INTRO] should be a text file containing intro message.\n
-        --outro [OUTRO] should be a text file containing the outro message.\n
+        --intro [INTRO_PATH] should be a text file containing intro message. Overrides value in conf.json\n
+        --outro [OUTRO_PATH] should be a text file containing the outro message. Overrides value in conf.json\n
         --mp3 [MP3] output message as an mp3 file.
-     
+
       Final message will be created from intro + message + outro
     CONVERT_MESSAGE_LONG_DESC
     option :intro, :type => :string
     option :outro, :type => :string
     option :mp3, :type => :string
-    def convert_to_phonetic(message)
+    def convert_to_phonetic(message_path)
       NumberStation::ConfigReader.read_config()
 
-      intro_path = options[:intro]
-      message_path = message
-      outro_path = options[:outro]
-      mp3_path = options[:mp3]
-      NumberStation.log.debug "intro_path: #{intro_path}" if options[:intro]
+      if options[:intro]
+        intro_path = options[:intro]
+        intro = NumberStation.to_phonetic(intro_path)
+      elsif NumberStation.data["resources"]["intro"]["enabled"]
+        intro_path = NumberStation.data["resources"]["intro"]["template"]
+        intro = NumberStation.to_phonetic(intro_path)
+      else
+        intro_path = ""
+      end
+
+      if options[:outro]
+        outro_path = options[:outro]
+        outro = NumberStation.to_phonetic(outro_path)
+      elsif NumberStation.data["resources"]["outro"]["enabled"]
+        outro_path = NumberStation.data["resources"]["outro"]["template"]
+        outro = NumberStation.to_phonetic(outro_path)
+      else
+        outro_path = ""
+        outro = ""
+      end
+      NumberStation.log.debug "intro enabled: #{NumberStation.data["resources"]["intro"]["enabled"]} path: #{intro_path}"
       NumberStation.log.debug "message_path: #{message_path}"
-      NumberStation.log.debug "outro_path: #{outro_path}" if options[:outro]
-      NumberStation.log.debug "mp3_path: #{mp3_path}" if options[:mp3]
+      NumberStation.log.debug "outro enabled: #{NumberStation.data["resources"]["outro"]["enabled"]} path: #{outro_path}"
 
-      output = ""
-      output += NumberStation.to_phonetic(intro_path) if options[:intro]
-      output += NumberStation.to_phonetic(message_path)
-      output += NumberStation.to_phonetic(outro_path) if options[:outro]
+      message = NumberStation.to_phonetic(message_path)
+      output = intro + message + outro
       NumberStation.log.info "output: #{output}"
 
       if options[:mp3]
+        mp3_path = options[:mp3]
+        NumberStation.log.debug "mp3_path: #{mp3_path}" if options[:mp3]
         NumberStation.log.debug "Generating mp3 output: #{mp3_path}"
         NumberStation.write_mp3(output, mp3_path)
       end
@@ -110,7 +117,7 @@ module NumberStation
       --numpads NUM\n
       --length LENGTH
 
-    If no parameters are passed it will generate 5 one time pads in the current 
+    If no parameters are passed it will generate 5 one time pads in the current
     directory of size 250 characters.
     MAKE_ONE_TIME_PAD_LONG_DESC
     option :length, :type => :numeric
@@ -198,5 +205,9 @@ module NumberStation
       NumberStation::ConfigReader.read_config()
       NumberStation.log.debug "Version: #{NumberStation::VERSION}"
     end
+
+    def self.exit_on_failure?()
+      false
+    end
   end
 end

data/lib/number_station/config_reader.rb

@@ -24,7 +24,7 @@ module NumberStation
 
     def self.read_config()
       begin
-        config_file_path = File.join(Dir.pwd, "conf.json")
+        config_file_path = File.join(Dir.home, "number_station/conf.json")
         NumberStation.set_data( JSON.parse(File.read(config_file_path)) )
         NumberStation.set_log( Logger.new(STDOUT) )
         NumberStation.log.level = NumberStation.data["logging"]["level"]

data/lib/number_station/phonetic_conversion.rb

@@ -95,7 +95,11 @@ module NumberStation
 
 
   def self.call_espeak(input_file_path, output_file_path)
-    cmd = "espeak -ven+f3 -m -p 60 -s 180 -f #{input_file_path} --stdout | ffmpeg -i - -ar 44100 -ac 2 -ab 192k -f mp3 #{output_file_path}"
+    if NumberStation.data["resources"]["espeak"]["glados"]
+      cmd = "espeak -ven+f3 -m -p 60 -s 180 -f #{input_file_path} --stdout | ffmpeg -i - -ar 44100 -ac 2 -ab 192k -f mp3 #{output_file_path}"
+    else
+      cmd = "espeak -m -p 60 -s 180 -f #{input_file_path} --stdout | ffmpeg -i - -ar 44100 -ac 2 -ab 192k -f mp3 #{output_file_path}"
+    end
 
     unless NumberStation.command?('espeak') || NumberStation.command?('ffmpeg')
       NumberStation.log.error "number_station requires the espeak and ffmpeg utilities are installed in order to output an mp3 file."
@@ -106,8 +110,12 @@ module NumberStation
 
 
   def self.write_mp3(message, output_file_path)
-    filename = NumberStation.data["resources"]["espeak_sentence_template"]
-    sentence = NumberStation.generate_sentence(message)
+    filename = NumberStation.data["resources"]["espeak"]["sentence_template"]
+    if NumberStation.data["resources"]["espeak"]["glados"]
+      sentence = NumberStation.generate_sentence(message)
+    else
+      sentence = message
+    end
     NumberStation.write_espeak_template_file(filename, sentence)
     NumberStation.call_espeak(filename, output_file_path)
   end
@@ -115,7 +123,7 @@ module NumberStation
 
   def self.to_phonetic(file_name)
     message = ''
-
+    puts file_name
     f = File.open(file_name)
     raw_message = f.read()
     f.close()
@@ -127,4 +135,4 @@ module NumberStation
   end
 
 
-end
+end

data/lib/number_station/version.rb

@@ -20,5 +20,5 @@
 =end
 
 module NumberStation
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/lib/number_station.rb

@@ -35,7 +35,7 @@ module NumberStation
   def self.command?(name)
     `which #{name}`
     $?.success?
-  end  
+  end
 
   def self.set_log(log)
     @log = log

data/number_station.gemspec

@@ -56,6 +56,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "pastel"
   spec.add_dependency "thor"
 
-  spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake"
 end

data/resources/conf.json

@@ -0,0 +1,14 @@
+{
+  "logging":{
+    "level":0
+  },
+  "server":{
+    "host":"0.0.0.0",
+    "port":8080
+  },
+  "resources":{
+    "espeak": {"sentence_template": "/tmp/espeak_tmp.xml", "glados":false},
+    "intro": {"template":"intro_message.txt", "enabled":true},
+    "outro": {"template":"outro_message.txt", "enabled":true}
+  }
+}

data/resources/intro_message.txt

@@ -1 +1 @@
-ei7htb ei7htb
+sample intro message

data/resources/outro_message.txt

@@ -1 +1 @@
-ei7htb ei7htb
+sample outro message

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: number_station
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - David Kirwan
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2018-11-29 00:00:00.000000000 Z
@@ -38,34 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.16'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.16'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 description: "(WIP) A collection of utilities to aid in running your own number station!"
 email:
 - davidkirwanirl@gmail.com
@@ -86,8 +72,8 @@ files:
 - README.asciidoc
 - Rakefile
 - bin/number_station
-- config/conf.json
 - lib/number_station.rb
+- lib/number_station/GLaDOS_espeak.rb
 - lib/number_station/cli.rb
 - lib/number_station/config_reader.rb
 - lib/number_station/decrypt_message.rb
@@ -96,7 +82,7 @@ files:
 - lib/number_station/phonetic_conversion.rb
 - lib/number_station/version.rb
 - number_station.gemspec
-- resources/body_message.txt
+- resources/conf.json
 - resources/intro_message.txt
 - resources/outro_message.txt
 homepage: https://rubygems.org/gems/number_station
@@ -104,7 +90,7 @@ licenses:
 - GPL 3.0
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -119,8 +105,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.0.9
+signing_key:
 specification_version: 4
 summary: "(WIP) Run your own number station!"
 test_files: []

data/config/conf.json

@@ -1,12 +0,0 @@
-{
-  "logging":{
-    "level":0
-  },
-  "server":{
-    "host":"localhost",
-    "port":8080
-  },
-  "resources":{
-    "espeak_sentence_template":"/tmp/GLaDOS_template.xml"
-  } 
-}

data/resources/body_message.txt

@@ -1 +0,0 @@
-1234abcd 5678efgh