bwcli 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74d73712b88433fc3573ed6361018686b95e8e18
-  data.tar.gz: 3705e7faae6ff8da83a0e92e85cc3dadfcc7293b
+  metadata.gz: ef8e740832b3c56470d00e388264cefe5c4cfed0
+  data.tar.gz: 694d79bd4663a392de3e750479ea5ea8041aa10c
 SHA512:
-  metadata.gz: ba7a0d48b232ff53b3631fb9228b6a5ce5baf975459888ca21e44e1a1290f2b088a54fca2d8069a004eb84abfece61b783b1c3a4bf0104c6bc315f9bb91cc5ae
-  data.tar.gz: caefe5b3737721cb1819932fe56c213dd852c3290d77a026f20353dca64da1e135e077d1564e35beb0313b9c204ec09c70ebc58f847f7ed0a84e00e255b48699
+  metadata.gz: 7c69167c5cdfa29a040411883155782e9fcaf7573646ef602a778b2ba1cfb56c7963b90a7bbda4800338d57c91dd96ff6e5aca3cedd7449b4f0fe55202b24779
+  data.tar.gz: c7f23b04f08e6daba85fa965080b5db1bb24385625cbc7f97870d019fb5ebadd72188030cc601bff2d149e4c6e42dffdcb460599adc788461c88c1952c30e928

data/README.md

@@ -1,3 +1,7 @@
+[![Gem Version](https://badge.fury.io/rb/bwcli.png)](http://badge.fury.io/rb/bwcli) 
+[![Dependency Status](https://gemnasium.com/jonathanchrisp/bwcli.png)](https://gemnasium.com/jonathanchrisp/bwcli)
+[![Code Climate](https://codeclimate.com/github/jonathanchrisp/bwcli.png)](https://codeclimate.com/github/jonathanchrisp/bwcli)
+
 # bwcli
 
 __PLEASE NOTE THAT THIS PROJECT IS NOT OFFICIALLY SUPPORTED BY BRANDWATCH__

data/bwcli.gemspec

@@ -1,6 +1,8 @@
+require File.dirname(__FILE__) + "/lib/bwcli/version"
+
 Gem::Specification.new do |s|
   s.name        = 'bwcli'
-  s.version     = '1.0.0'
+  s.version     = BWCLI::VERSION
   s.date        = '2013-08-15'
   s.summary     = 'Brandwatch CLI'
   s.description = 'A CLI interface to interact with the Brandwatch v2 API'

data/lib/bwcli/config.rb

@@ -41,10 +41,10 @@ module BWCLI
       conf.set_current_user options[:e], options[:u] if yes? "Would you like set this user as the current user?"
     end
 
-    desc "switch", "Switch to user"
+    desc "set", "Set the current user"
     method_option :u, :banner => 'Username', :required => true
     method_option :e, :banner => 'Environment', :required => true
-    def switch
+    def set
       conf.set_current_user options[:e], options[:u]
     end
 

data/lib/bwcli/configuration.rb

@@ -1,4 +1,6 @@
 require 'yaml'
+require "openssl"
+require "digest"
 
 module BWCLI
 
@@ -10,7 +12,9 @@ module BWCLI
       @config_file = File.join(File.expand_path("~"), ".bwcli")
       @config = Hashie::Mash.new(YAML.load_file @config_file)
     rescue Errno::ENOENT
-      abort "You dont have a .bwcli file!".red.underline
+      File.new(@config_file, "w")
+      puts "\nAs you didn't have a .bwcli file, I created one for you!\n".green
+      retry
     end
 
     # Add user to the config hash
@@ -21,7 +25,7 @@ module BWCLI
     def add_user env, username, pwd
       config[env] = {} unless env_exists? env
       abort "The #{username} already exists!".yellow if user_exists? env, username
-      config[env][username] = { 'access_token' => '', 'password' => pwd }
+      config[env][username] = { 'access_token' => '', 'password' => encrypt_password(username, pwd) }
       write_config
     end
 
@@ -47,7 +51,7 @@ module BWCLI
       abort "There is no access token set for the current user".yellow if config.current_user.access_token.nil?
       abort "There is no environment set for the current user".yellow if config.current_user.environment.nil?
 
-      return @bwapi ||= BWAPI::Client.new(:username => current_user.username, :password => current_user.password, :api_endpoint => api_endpoint)
+      return @bwapi ||= BWAPI::Client.new(:username => current_user.username, :password => decrypt_password(current_user.username, current_user.password), :api_endpoint => api_endpoint)
     end
 
     # Returns the config
@@ -85,10 +89,10 @@ module BWCLI
     # List all users within the config hash
     def list_users
       abort "You have no users within your config file!".yellow if config.empty?
-      puts "\nUser Configuration".yellow
+      puts "\nUser Configuration"
       config.each do |k, v|
         next if k == 'current_user'
-        puts "\nEnvironment: #{k}".yellow
+        puts "\nEnvironment: #{k}"
         print_hash_values v
       end
 
@@ -98,9 +102,13 @@ module BWCLI
     # List the current user within the config hash
     def list_current_user
       abort "You have no current user set!".yellow unless current_user_exists?
-      puts "\nCurrent User:".yellow
+      puts "\nCurrent User"
       config.current_user.each do |k,v|
-        puts "#{k.yellow}: #{v}\n" unless v.nil?
+        if k == 'password'
+          puts "#{k.yellow}: ** HIDDEN **".yellow
+        else
+          puts "#{k.yellow}: #{v}".yellow unless v.nil?
+        end
       end
     end
 
@@ -117,19 +125,6 @@ module BWCLI
       return bwapi
     end
 
-    # Print out hash values
-    def print_hash_values hash
-      puts hash.yellow unless hash.is_a? Hash
-      hash.each do |k, v|
-        if v.is_a? Hash
-          puts "User: #{k}:".yellow
-          print_hash_values v
-        else
-          puts " - #{k}: #{v}"
-        end
-      end
-    end
-
     # Resets the config to an empty hash
     def reset
       @config = {}
@@ -182,5 +177,40 @@ module BWCLI
       File.open(@config_file, "w"){|f| YAML.dump(config, f)}
     end
 
+    private
+
+    def encrypt_password key, pwd
+      key = Digest::SHA256.digest(key) if(key.kind_of?(String) && 32 != key.bytesize)
+      aes = OpenSSL::Cipher.new('AES-256-CBC')
+      aes.encrypt
+      aes.key = key
+      return aes.update(pwd) + aes.final
+    end
+
+    def decrypt_password key, pwd
+      key = Digest::SHA256.digest(key) if(key.kind_of?(String) && 32 != key.bytesize)
+      aes = OpenSSL::Cipher.new('AES-256-CBC')
+      aes.decrypt
+      aes.key = key
+      return aes.update(pwd) + aes.final
+    end
+
+    # Print out hash values
+    def print_hash_values hash
+      puts hash unless hash.is_a? Hash
+      hash.each do |k, v|
+        if v.is_a? Hash
+          puts "User:".yellow + " #{k}"
+          print_hash_values v
+        else
+          if k == 'password'
+            puts "#{k.yellow}: ** HIDDEN **"
+          else
+            puts "#{k.yellow}: #{v}\n" unless v.nil?
+          end
+        end
+      end
+    end
+
   end
 end

data/lib/bwcli/me.rb

@@ -9,11 +9,12 @@ module BWCLI
       def configuration
         @configuration ||= BWCLI::Configuration.new
       end
+      alias :conf :configuration
     end
 
     desc "me", "Users credentials"
     def me
-      ap configuration.oauth.me
+      ap conf.oauth.me
     end
     default_task :me
 

data/lib/bwcli/projects.rb

@@ -9,15 +9,16 @@ module BWCLI
       def configuration
         @configuration ||= BWCLI::Configuration.new
       end
+      alias :conf :configuration
     end
 
     desc "projects", "Users projects"
-    method_option :i, :banner => 'project id', :required => false
+    method_option :i, :banner => 'project id', :required => false, :type => :numeric
     def projects
       if options[:i].nil?
-        ap configuration.oauth.projects
+        ap conf.oauth.projects
       else
-        configuration.oauth.project options[:i]
+        ap conf.oauth.project options[:i]
       end
     end
     default_task :projects

data/lib/bwcli/version.rb

@@ -0,0 +1,3 @@
+module BWCLI
+  VERSION = "2.0.0"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bwcli
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Jonathan Chrisp
@@ -113,6 +113,7 @@ files:
 - lib/bwcli/configuration.rb
 - lib/bwcli/me.rb
 - lib/bwcli/projects.rb
+- lib/bwcli/version.rb
 homepage: https://github.com/jonathanchrisp/bwcli
 licenses:
 - MIT