wpps 0.2.4 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8320bfc6c0f49190dd79e4d44c2e76e1907cc64e
-  data.tar.gz: 2589f51754aa3e10bce0312f3d606b0a134e03f0
+  metadata.gz: c6eee0097df00b23ec18bae46054835c6c86a4ee
+  data.tar.gz: aa53450a075147f36824a65b0a688400376c6c63
 SHA512:
-  metadata.gz: 23f477e8e729c16b137c4dda20484331e2538d4c004f933ffd68df7354af5681d387adee8bbd35626ac6b482ed21622ad67532daaaf2e1bd88c16435a0cbe983
-  data.tar.gz: 7722b843b8ecb3e3e4209bf8401206d4e5cb035908a664e91cc8cc910c524859fcee5db01ee4a8f827dc7fb3f3b3ee88b3bb292057bb7dd256870ee0cd3da44c
+  metadata.gz: 10329e5fe521ac3a54ddc0a1c128c4946a4b4d45cbba32bd097c619dd508c894e01cbcebf8109e79927292f3b664cb9f792ba068c3bdfdb2b156d0cd4c075a85
+  data.tar.gz: e298cd434fb30401780d41ef5d064d5919ad93d014dee27f73519d504df61dc69a4294dafcb4874b249d619b9ffea67de4b89fd07a1cf16afa91f169905dfce1

data/bin/pwrslv

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# coding: utf-8
 
 require 'rubygems'
 require 'twitter'
@@ -7,12 +8,16 @@ require 'optparse'
 require 'nokogiri'
 require 'wputils'
 require 'whiplash/version'
+require 'initcommand'
 
-usage = "Usage: pwrslv [OPTIONS]"
+usage = "Usage: pwrslv init {url|file} [--ovrwr]\n"\
+        "       pwrslv [OPTIONS]"
 
-options = { :maxtweets => 1,
-            :interative => false,
-            :verbose => 0
+# Setting default options
+options = { :maxtweets => 1,       # Number of tweets to get from tweeter
+            :interative => false,  # No interactive
+            :ovrwr => false,       # No overwrite
+            :verbose => 0          # Verbosity level: no message
           }
 OptionParser.new do |opt|
   opt.banner = usage
@@ -29,6 +34,9 @@ OptionParser.new do |opt|
          'Maximum number of tweets retrieve from',
          'a specific TAG'
         ) { |o| options[:maxtweets] = o.to_i }
+  opt.on('--ovrwr',
+         'flag that enables overrides files,',
+         'directories') { |o| options[:ovrwr] = true }
   opt.on('-t',
          '--tag TAG',
          String,
@@ -37,7 +45,7 @@ OptionParser.new do |opt|
         ) { |o| options[:tag] = o }
   opt.on('--verbose LEVEL') do |o|
     options[:verbose] = o.to_i
-    unless 0 <= options[:verbose] and options[:verbose] <= 2
+    unless 0 <= options[:verbose] and options[:verbose] <= 3
       puts opt.help
       exit 1
     end
@@ -52,68 +60,92 @@ OptionParser.new do |opt|
   end
 end.parse!
 
+if ARGV[0] == "init" then
+  ARGV.shift
+  if ARGV.length == 1 then
+    createSubTreeDirectory('.powerslave', options[:ovrwr], ARGV[0])
+    exit 0
+  else
+    STDERR.puts usage
+    exit 1
+  end
+end
+
 unless ARGV.empty? then
-  puts usage
+  STDOUT.puts usage
   exit 1
 end
 
-usertwitter=ARGV[0]
+# usertwitter=ARGV[0]
 
 yamlconf = getPScfgFile()
 client = get_tweeter_client(yamlconf)
 
 begin
   tag = getWPTag(options)
+  puts "Tag: #{tag}" if options[:verbose] > 0
   tweets = client.search(tag)
-
+  puts "Tweets: #{tweets}" if options[:verbose] > 0
   nro = 0
   tweets.each do |tw|
     nro += 1
-    # puts "Tweet text: #{tw.text}"
+    printLevelMsg(1, options[:verbose], "Tweet text: #{tw.text}")
+    
     uri = /https:\/\/t.co\/.*/.match(tw.text)
-    unless uri == nil
-      # puts "Getting uri: #{uri[0]} short uri:"
-      unless uri[0] == nil
-        ruri = resolve_redirects(uri[0])
-        idinfo = /http:\/\/pastie\.org\/(\d+)/.match(ruri)
-        # puts "Processing idinfo: #{idinfo[0]}"
-        unless idinfo[1] == nil
-          # puts "Getting Pastie: #{idinfo[1]}"
-          p = Pastie.get(idinfo[1])
-          # puts "Pastie: #{p}"
-          unless p == nil
-            doc = Nokogiri::HTML(p.content)
-            src = doc.at('body').at('pre').
-                  inner_html.gsub("<br>", "\n").gsub("<br/>", "\n").
-                  gsub("&lt;","<").gsub("&gt;",">").gsub("&amp;", "&")
-            lines = src.split(/\n/)
-            lastLine = lines[lines.length - 1]
-            psflnm = /.*filename: (.*)/.match(lines[lines.length - 1])
-            if psflnm[1] == nil
-              puts "Cannot get filename from pastie link. Process ends"
-              exit 1
-            end
-            filename = psflnm[1]
-            print "Start writing #{filename}"
-            $stdout.flush
-            begin
-              file = File.open(filename, "w+")
-              nwlines = lines.first(lines.length - 1)
-              nwlines.each do |line|
-                file.puts(line)
-              end
-            rescue Exception => e
-              puts "\nError writting #{filename} due: #{e}"
-              exit 1
-            end
-            puts " End writing #{filename}"
-          end
-        end
-      end
+    endIfNil(uri, "Invalid URI on tweet")
+    printLevelMsg(1, options[:verbose], "Getting uri: #{uri[0]} short uri:")
+    
+    endIfNil(uri[0], "Invalid URI format")
+    
+    ruri = resolve_redirects(uri[0])
+    printLevelMsg(1, options[:verbose], "Resolved URI: #{ruri}")
+    
+    idinfo = /http:\/\/pastie\.org\/(\d+)/.match(ruri)
+    printLevelMsg(1, options[:verbose], "Processing idinfo: #{idinfo[0]}")
+
+    endIfNil(idinfo[1], "Invalid Pastie id")
+    printLevelMsg(1, options[:verbose], "Getting Pastie id: #{idinfo[1]}")
+    
+    p = Pastie.get(idinfo[1])
+    printLevelMsg(1, options[:verbose], "Pastie: #{p}") 
+    endIfNil(p, "get pastie is nil")
+    
+    doc = Nokogiri::HTML(p.content)
+    src = doc.at('body').at('pre').
+          inner_html.gsub("<br>", "\n").gsub("<br/>", "\n").
+          gsub("&lt;","<").gsub("&gt;",">").gsub("&amp;", "&").
+          gsub("&aacute;", "á").gsub("&eacute;", "é").gsub("&iacute;", "í").
+          gsub("&oacute;", "ó").gsub("&uactue;", "ú")
+    printLevelMsg(3, options[:verbose], "Source file: #{src}")
+    
+    lines = src.split(/\n|\r\n/)
+    lastLine = lines[lines.length - 1]
+    psflnm = /.*filename: (.*)/.match(lastLine)
+    
+    endIfNil(psflnm[1], "Cannot get filename from pastie link. Process ends")
+    filename = psflnm[1]
+    
+    STDOUT.print "Start writing #{filename}"
+    STDOUT.flush
+    
+    begin
+      
+      file = File.open(filename, "w+")
+      nwlines = lines.first(lines.length - 1).last(lines.length - 2)
+      file.puts(nwlines)
+      # nwlines.each do |line|
+      #   file.puts(line)
+      # end
+    rescue Exception => e
+      STDERR.puts "\nError writting #{filename} due: #{e}"
+      exit 1
     end
+    
+    STDOUT.puts " End writing #{filename}"
+    
     break if nro == options[:maxtweets]
   end
 rescue Exception => e
-  puts e
+  STDERR.puts e
   exit 1
 end

data/bin/wp

@@ -7,15 +7,28 @@ require 'optparse'
 require 'extensions'
 require 'wputils'
 require 'whiplash/version'
+require 'initcommand'
 
-usage = "Usage: wp [OPTIONS]"
+usage = "Usage: wp init {url|file} [--ovrwr]\n"\
+        "       wp [options] filename"
 
-options = {}
+options = { :ovrwr => false,
+            :auth  => nil
+          }
 OptionParser.new do |opt|
   opt.banner = usage
   opt.version = Whiplash::VERSION
   opt.separator ""
   opt.separator "Specific options:"
+  opt.on('-a',
+         '--auth FILE',
+         String,
+         'A FILE that contains the twitter\'s',
+         'authorizations tokens'
+        ) { |o| options[:auth] = o }  
+  opt.on('--ovrwr',
+         'flag that enables overrides files,',
+         'directories') { |o| options[:ovrwr] = true }
   opt.on('-m',
          '--message MESSAGE',
          String,
@@ -36,6 +49,18 @@ OptionParser.new do |opt|
   end
 end.parse!
 
+# Test if is a init command
+if ARGV[0] == "init" then
+  ARGV.shift
+  if ARGV.length == 1 then
+    createSubTreeDirectory('.whiplash', options[:ovrwr], ARGV[0])
+    exit 0
+  else
+    STDERR.puts usage
+    exit 1
+  end
+end
+
 if ARGV.empty? or ARGV.length > 1 then
   puts usage
   exit 1
@@ -45,22 +70,19 @@ sendfile=ARGV[0]
 unless options[:message] == nil
   user_message = options[:message]
 else
-  user_message = ""
+  user_message = "NO MESSAGE"
 end
 
-yamlconf = getWPcfgFile()
+yamlconf = getWPcfgFile(options[:auth])
 
 # Reading a file
 unless File::exist? sendfile or File::readable? sendfile
-  puts "Error: file #{sendfile} does not exist or not readable"
+  STDERR.puts "Error: file #{sendfile} does not exist or not readable"
   exit 1
 end
 
 file = File.new(sendfile, "r")
-conts = ""
-file.each_line do |line|
-  conts += line
-end
+conts = file.read
 file.close
 
 # Create a new paste
@@ -69,7 +91,13 @@ lang = le.getLangDesc(File.extname sendfile)
 exts = File.extname sendfile
 comm = lang.prodComment('filename: ' + (File.basename sendfile))
 conts = conts + comm
-p = Pastie.create(conts, false, lang.name)
+p = nil
+begin 
+  p = Pastie.create(conts, false, lang.name)
+rescue => error
+  STDERR.puts "Error pastie: #{error.class} and #{error.message}"
+  exit 1
+end
 
 # Getting environment variables that contains the tag info
 tag = getWPTag(options)
@@ -81,12 +109,14 @@ client = get_tweeter_client(yamlconf)
 begin
   tweet_message = tag + " " + user_message + " " + p.link
   if tweet_message.length > 240
-    puts "wp cannot send message: #{tweet_message} because too long: #{tweet_emssage.length}"
+    STDERR.puts "wp cannot send message: #{tweet_message} because too long: #{tweet_emssage.length}"
     exit 1
   end
   tweet = client.update(tweet_message)
-  puts "Tweet id: #{tweet.id}"
+  histfile = File.join(ENV['HOME'], '.whiplash', 'history', tweet.id.to_s)
+  creatFileWrTr(histfile, conts)
+  STDOUT.puts "Tweet id: #{tweet.id}"
 rescue Exception => e
-  puts "wp could not sent message send due: #{e.message}"
+  STDERR.puts "wp could not send a message due: #{e.message}"
   exit 1
 end

data/lib/initcommand.rb

@@ -0,0 +1,63 @@
+require 'net/http'
+require 'uri'
+
+def createSubTreeDirectory(workDir, ovrwr, url)
+  workPath = ENV['HOME'] + '/' + workDir
+
+  if Dir.exists? workPath then
+    if ovrwr then
+      eraseDirAll(workPath)
+    else
+      STDERR.puts "#{workPath} already exists"
+      exit 1
+    end
+  end
+  
+  Dir.mkdir workPath
+  File.chmod(0700, workPath) 
+  Dir.mkdir workPath + '/config'
+  File.chmod(0700, workPath + '/config')
+  Dir.mkdir workPath + '/history'
+  File.chmod(0700, workPath + '/history')
+  createAuthFile(url, workPath + '/config/auth')
+end
+
+def eraseDirAll(dir)
+  if Dir.exists? dir then
+    Dir.foreach(dir) do |filename|
+      if not (filename == '.' or filename == '..') then
+        pathname = dir + '/' + filename
+        if File.file? pathname then
+          File.delete pathname
+        elsif File.directory? pathname then
+          eraseDirAll pathname
+        else
+          puts "This never could happen #{pathname}"
+          # Unknown file
+        end
+      end
+    end
+    Dir.delete(dir)
+  end
+end
+
+def createAuthFile(url, authfile)
+  uriclass = URI.parse(url)
+  perms = String.new
+  if uriclass.scheme == "http" or uriclass.scheme == "https" then
+    perms = Net::HTTP.get(URI.parse(url))
+  elsif uriclass.scheme == "file" then
+    urlfile = File.open(uriclass.path, "r")
+    perms = urlfile.read
+    urlfile.close
+  else
+    urlfile = File.open(url, "r")
+    perms = urlfile.read
+    urlfile.close
+  end
+
+  # puts perms
+  f = File.new(authfile, File::CREAT|File::TRUNC | File::WRONLY, 0600)
+  f.write perms
+  f.close
+end

data/lib/whiplash/version.rb

@@ -1,3 +1,3 @@
 class Whiplash
-  VERSION = '0.2.4'
+  VERSION = '0.3.2'
 end

data/lib/wputils.rb

@@ -23,13 +23,13 @@ rescue Faraday::Error, Faraday::Error::ConnectionFailed => e
   return nil
 end
 
-def getWPcfgFile()
-  filepath=ENV["HOME"] + "/" + ".whiplash"
+def getWPcfgFile(file)
+  filepath=file || File.join(ENV['HOME'], '.whiplash', 'config' ,'auth')
   YAML.load_file(filepath)
 end
 
 def getPScfgFile()
-  filepath=ENV["HOME"] + "/" + ".powerslave"
+  filepath=File.join(ENV['HOME'], '.powerslave', 'config', 'auth')
   YAML.load_file(filepath)
 end
 
@@ -51,3 +51,29 @@ def getWPTag(options)
   end
   return ("#" + pTag)
 end
+
+def endIfNil(value, msg)
+  if value.nil?
+    STDERR.puts msg
+    exit 1
+  end
+end
+
+def printLevelMsg(levelMsg, currentLevel, msg)
+  case currentLevel
+  when 0
+    levelMsg = 0
+  when 1, levelMsg == currentLevel
+    STDERR.puts msg
+  when 2, levelMsg <= currentLevel
+    STDERR.puts msg
+  when 3, levelMsg <= currentLevel
+    STDERR.puts msg
+  end
+end
+
+def creatFileWrTr(filename, msg)
+  hf = File.new(filename, File::CREAT|File::TRUNC|File::RDWR,0600)
+  hf.write msg
+  hf.close
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wpps
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.2
 platform: ruby
 authors:
 - Juan Francisco Cardona McCormick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-20 00:00:00.000000000 Z
+date: 2016-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: twitter
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.14.0
+        version: 5.16.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.14.0
+        version: 5.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.14.0
+        version: 5.16.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.14.0
+        version: 5.16.0
 - !ruby/object:Gem::Dependency
   name: pastie-api
   requirement: !ruby/object:Gem::Requirement
@@ -56,20 +56,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.9.2
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.9.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.9.2
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
@@ -96,21 +96,21 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.6.2
+        version: 1.6.7.2
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.6.2
+        version: 1.6.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.6.2
+        version: 1.6.7.2
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.6.2
-description: Share snippets of code with a group of persons by twitter
+        version: 1.6.7.2
+description: Share code's snippets by using twitter and pastie
 email: jfcmacro@gmail.com
 executables:
 - wp
@@ -121,6 +121,7 @@ files:
 - bin/pwrslv
 - bin/wp
 - lib/extensions.rb
+- lib/initcommand.rb
 - lib/whiplash/version.rb
 - lib/wputils.rb
 homepage: https://github.com/jfcmacro/whiplash
@@ -143,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: The whip hand