quandl_utility 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03eb516e16528dee425ec889bd77d73b0e0604d7
-  data.tar.gz: ea667879527199ab7de88114e2738f6ead865e35
+  metadata.gz: a466e990945d2a0bf3399f68892f74302e5f875d
+  data.tar.gz: 459c92f7fa3b4c42ffa85bb6e6e86c664dea79e0
 SHA512:
-  metadata.gz: e41e9bc4c3ce32b732e0ac767b27eda9df474bad28d6bd6fb1f88db366a2ff36548d264a096aeb3da8a88a12f91af25e5b270b32dfbcfaf079142eed704c0587
-  data.tar.gz: 15119a4ad2fb787f720446983492e003688bc81c92055a126d426f8ca5de438bbdfd6efcfadb5dac8186142753ece40bd269ec1a0f73d9ace8ec9a5ebf3d1340
+  metadata.gz: e8bf4ba28e6f7005301c477ce9de48609e9982c82905f06e465c4149e0f528e9dba3e8ad14be36690fd94bea131a06349ff99aaccbd8089aff5f9cbe6fd76463
+  data.tar.gz: c0af7f2795d192767ba5fc6136274b4126d454e10ed37fe76a04d11cae3010d7ab0d0be0c952fb0b82357fd150292dedaa069a25ca768660f439ca0f94ff9d4b

data/.rubocop.yml

@@ -7,6 +7,10 @@ AlignParameters:
   Exclude:
     - lib/quandl/utility/thor_tasks/*
 LineLength:
-  Max: 100
+  Max: 150
 MethodLength:
-  Max: 20
+  Max: 20
+Documentation:
+  Enabled: false
+Debugger:
+  Enabled: false

data/Gemfile

@@ -1,2 +1,2 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 gemspec

data/README.md

@@ -21,7 +21,7 @@ Quandl::Utility Thor tasks are available in two ways:
 * Using the executable 'qutil'
 
 ```bash
-qutil notify slack '#general' 'ping!' -w 'WEBHOOK_URL'
+qutil ci:notify_slack
 ```
 
 * Including in your Thorfile
@@ -31,7 +31,7 @@ require 'quandl/utility/thor_tasks'
 
 desc 'my_task'
 def my_task
-  invoke 'qutil:slack:notify', ['#general', 'ping!']
+  invoke 'qutil:ci:notify_slack', ['#general', 'ping!']
 end
 ```
 
@@ -81,17 +81,3 @@ Notify slack of build status. Uses various tddium ENV variables to build a messa
 ```bash
 qutil ci notify_slack
 ```
-
-### Notify
-
-Task for notifications. Currently supports sending messages to Slack.
-
-```bash
-qutil notify help
-```
-
-#### slack
-
-```bash
-qutil notify slack MESSAGE #CHANNEL -w WEBHOOK_URL
-```

data/Rakefile

@@ -1,12 +1,12 @@
-require "bundler"
-require "rake"
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler'
+require 'rake'
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 require 'pry'
 
-task :default => :spec
+task default: :spec
 
-desc "Run all specs"
+desc 'Run all specs'
 RSpec::Core::RakeTask.new(:spec) do |task|
-  task.pattern = "spec/**/*_spec.rb"
+  task.pattern = 'spec/**/*_spec.rb'
 end

data/Thorfile

@@ -1,4 +1,4 @@
-$:.push File.expand_path('../lib', __FILE__)
+$LOAD_PATH.push File.expand_path('../lib', __FILE__)
 
 require 'bundler'
 require 'thor'

data/UPGRADE.md

@@ -1,3 +1,8 @@
+## 0.2.2
+
+* Replace notify thor task with Quandl::Slack
+* Make Rubocop compliant
+
 ## 0.2.1
 
 * Add support for custom CI notification messages.
@@ -53,4 +58,4 @@
 
 ## 0.0.1
 
-* Version bump to 0.0.1
+* Version bump to 0.0.1

data/bin/qutil

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
-$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
+$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + '/../lib'))
 require 'quandl/utility/cli'
 Quandl::Utility::CLI.start

data/lib/quandl/utility/cli.rb

@@ -1,6 +1,5 @@
 require 'thor'
 require 'quandl/utility/thor_tasks/lint'
-require 'quandl/utility/thor_tasks/notify'
 require 'quandl/utility/thor_tasks/ci'
 
 module Quandl
@@ -12,9 +11,6 @@ module Quandl
       desc 'lint', 'Linting subcommands'
       subcommand 'lint', Quandl::Utility::ThorTasks::Lint
 
-      desc 'notify', 'Notification subcommands'
-      subcommand 'notify', Quandl::Utility::ThorTasks::Notify
-
       desc 'ci', 'CI Server subcommands'
       subcommand 'ci', Quandl::Utility::ThorTasks::CI
     end

data/lib/quandl/utility/configuration.rb

@@ -1,62 +1,58 @@
 module Quandl
-module Utility
-class Configuration
-  
-  class << self
-    
-    def define_attributes(*attribute_names)
-      attribute_names.each do |key|
-        define_attribute(key)
+  module Utility
+    class Configuration
+      class << self
+        def define_attributes(*attribute_names)
+          attribute_names.each do |key|
+            define_attribute(key)
+          end
+        end
+
+        def attributes
+          @attributes ||= []
+        end
+
+        protected
+
+        def define_attribute(key)
+          key = key.to_s
+          attributes << key unless attributes.include?(key)
+          define_method(key) { read_attribute(key) }
+          define_method("#{key}=") { |value| write_attribute(key, value) }
+        end
+      end
+
+      def initialize(object = {})
+        self.attributes = object
+        after_initialize
+      end
+
+      def after_initialize
+      end
+
+      def to_h
+        attributes
+      end
+
+      def attributes=(attrs)
+        attrs.each do |key, value|
+          send("#{key}=", value) if self.respond_to?("#{key}=")
+        end
+      end
+
+      def attributes
+        @attributes ||= {}
+      end
+
+      protected
+
+      def read_attribute(key)
+        attributes[key.to_s]
+      end
+
+      def write_attribute(key, value)
+        attributes[key.to_s] = value
       end
-    end
-    
-    def attributes
-      @attributes ||= []
-    end
-    
-    protected
-    
-    def define_attribute(key)
-      key = key.to_s
-      attributes << key unless attributes.include?(key)
-      define_method( key ){ read_attribute(key) }
-      define_method( "#{key}=" ){ |value| write_attribute(key, value) }
-    end
-    
-  end
-  
-  def initialize(object={})
-    self.attributes = object
-    after_initialize
-  end
-  
-  def after_initialize
-  end
-  
-  def to_h
-    attributes
-  end
-  
-  def attributes=(attrs)
-    attrs.each do |key, value|
-      self.send("#{key}=", value) if self.respond_to?("#{key}=")
     end
   end
-  
-  def attributes
-    @attributes ||= {}
-  end
-  
-  protected
-  
-  def read_attribute(key)
-    attributes[key.to_s]
-  end
-  
-  def write_attribute(key, value)
-    attributes[key.to_s] = value
-  end
-  
-end
 end
-end

data/lib/quandl/utility/rake_tasks.rb

@@ -1,2 +1,2 @@
 require 'rake'
-require "quandl/utility"
+require 'quandl/utility'

data/lib/quandl/utility/tasks.rb

@@ -1,38 +1,35 @@
 module Quandl
-module Utility
-class Tasks
+  module Utility
+    class Tasks
+      class << self
+        attr_accessor :configuration
+      end
 
-  class << self
-    attr_accessor :configuration
-  end
+      def self.configuration
+        @configuration ||= TaskConfig.new
+      end
 
-  def self.configuration
-    @configuration ||= TaskConfig.new
-  end
+      def self.configure
+        yield(configuration)
+        load File.join(Quandl::Utility.root_path, 'tasks/utility.rake')
+        true
+      end
 
-  def self.configure
-    yield(configuration)
-    load File.join( Quandl::Utility.root_path, 'tasks/utility.rake' )
-    true
-  end
+      class TaskConfig < Quandl::Utility::Configuration
+        define_attributes :name, :changelog_path, :changelog_matching, :version_path, :tag_prefix
 
-  class TaskConfig < Quandl::Utility::Configuration
-    define_attributes :name, :changelog_path, :changelog_matching, :version_path, :tag_prefix
-    
-    def version_with_prefix
-      "#{tag_prefix}#{version}"
-    end
-    
-    def tag_prefix
-      read_attribute(:tag_prefix)
-    end
-    
-    def version
-      @version ||= File.exists?(version_path) ? File.read(version_path) : '0.0.0'
+        def version_with_prefix
+          "#{tag_prefix}#{version}"
+        end
+
+        def tag_prefix
+          read_attribute(:tag_prefix)
+        end
+
+        def version
+          @version ||= File.exist?(version_path) ? File.read(version_path) : '0.0.0'
+        end
+      end
     end
-    
   end
-
-end
 end
-end

data/lib/quandl/utility/thor_tasks.rb

@@ -1,3 +1,2 @@
 require_relative 'thor_tasks/lint'
-require_relative 'thor_tasks/notify'
-require_relative 'thor_tasks/ci'
+require_relative 'thor_tasks/ci'

data/lib/quandl/utility/thor_tasks/ci.rb

@@ -1,4 +1,7 @@
 require 'thor'
+require 'quandl/slack'
+
+Quandl::Slack.generate_notifier('ci')
 
 module Quandl
   module Utility
@@ -10,9 +13,7 @@ module Quandl
         desc 'notify_slack', 'Notify Quandl of build status of CI'
         def notify_slack(message = nil)
           notification = message.nil? ? ci_build_message : "#{ci_build_message} - #{message}"
-          invoke 'qutil:notify:slack',
-            [notification, slack_channel],
-            emoji: slack_emoji
+          Quandl::Slack::Ci.ping(notification, channel: slack_channel, icon_emoji: slack_emoji)
         end
 
         private

data/lib/quandl/utility/version.rb

@@ -1,5 +1,5 @@
 module Quandl
   module Utility
-    VERSION = '0.2.1'
+    VERSION = '0.2.2'
   end
 end

data/quandl_utility.gemspec

@@ -1,33 +1,33 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "quandl/utility/version"
+$LOAD_PATH.push File.expand_path('../lib', __FILE__)
+require 'quandl/utility/version'
 
 Gem::Specification.new do |s|
-  s.name        = "quandl_utility"
+  s.name        = 'quandl_utility'
   s.version     = Quandl::Utility::VERSION
-  s.authors     = ["Blake Hilscher"]
-  s.email       = ["dev@quandl.com"]
-  s.homepage    = "https://www.quandl.com"
-  s.license     = "MIT"
-  s.summary     = "Utility Tools"
-  s.description = "Tools for making our lives easier."
+  s.authors     = ['Blake Hilscher', 'Jason Byck', 'Najwa Azer']
+  s.email       = ['dev@quandl.com']
+  s.homepage    = 'https://www.quandl.com'
+  s.license     = 'MIT'
+  s.summary     = 'Utility Tools'
+  s.description = 'Tools for making our lives easier.'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib", 'tasks']
+  s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
+  s.require_paths = %w(lib tasks)
 
-  s.add_runtime_dependency "activesupport", ">= 3.0.0"
-  s.add_runtime_dependency "rake"
+  s.add_runtime_dependency 'activesupport', '>= 3.0.0'
+  s.add_runtime_dependency 'rake'
   s.add_runtime_dependency 'thor'
   s.add_runtime_dependency 'thor-foodcritic'
   s.add_runtime_dependency 'rubocop'
-  s.add_runtime_dependency 'slack-notifier', '~> 1'
+  s.add_runtime_dependency 'quandl-slack'
 
-  s.add_development_dependency "rspec", "~> 2.13"
-  s.add_development_dependency "fivemat", "~> 1.2"
-  s.add_development_dependency "pry"
-  s.add_development_dependency "simplecov"
-  s.add_development_dependency "guard"
-  s.add_development_dependency "guard-rspec"
-end
+  s.add_development_dependency 'rspec', '~> 2.13'
+  s.add_development_dependency 'fivemat', '~> 1.2'
+  s.add_development_dependency 'pry'
+  s.add_development_dependency 'simplecov'
+  s.add_development_dependency 'guard'
+  s.add_development_dependency 'guard-rspec'
+end

data/spec/spec_helper.rb

@@ -1,8 +1,8 @@
-$:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), *%w(.. lib))
 
-require "rspec"
+require 'rspec'
 require 'pry'
 
 RSpec.configure do |config|
   config.include FactoryGirl::Syntax::Methods
-end
+end

data/support/templates/project.rubocop.yml.erb

@@ -1,4 +1,4 @@
 inherit_from: <%= @base_directory %>/.rubocop.yml
 
-# Genereated automatically by Quandl::Utility at <%= Time.now %>
-# Project specific rules go here...
+# Generated automatically by Quandl::Utility at <%= Time.now %>
+# Project specific rules go here...

data/tasks/utility.rake

@@ -1,98 +1,97 @@
 gemc = Quandl::Utility::Tasks.configuration
 
-task :console do |t, args|
+task :console do |_t, _args|
   require 'pry'
   binding.pry
 end
 
 namespace gemc.name do
-  
+
   desc "Tag #{gemc.name} with #{gemc.version_with_prefix}"
   task :tag do
-    raise "Must be a git repo." if %x{git status 2>&1} =~ /Not a git repository/
+    fail 'Must be a git repo.' if `git status 2>&1` =~ /Not a git repository/
     version = "#{gemc.tag_prefix}#{File.read('VERSION')}"
     system("git tag -a #{version} -m 'Release #{version}'")
-    system("git push --tags")
+    system('git push --tags')
   end
-  
+
   namespace :bump do
-    
+
     desc "Perform major bump to #{gemc.name}"
     task :major do
-      Rake::Task['quandl:bump:perform'].execute( severity: 'major' )
+      Rake::Task['quandl:bump:perform'].execute(severity: 'major')
     end
     desc "Perform minor bump to #{gemc.name}"
     task :minor do
-      Rake::Task['quandl:bump:perform'].execute( severity: 'minor' )
+      Rake::Task['quandl:bump:perform'].execute(severity: 'minor')
     end
     desc "Perform patch bump to #{gemc.name}"
     task :patch do
-      Rake::Task['quandl:bump:perform'].execute( severity: 'patch' )
+      Rake::Task['quandl:bump:perform'].execute(severity: 'patch')
     end
-    
+
   end
-  
+
 end
 
-namespace :quandl do 
-  
+namespace :quandl do
+
   namespace :bump do
 
-    task :perform, :severity do |t, args|
+    task :perform, :severity do |_t, args|
       # update changelog
-      raise "Must be a git repo." if %x{git status 2>&1} =~ /Not a git repository/
-      raise "You have unstaged commits." if %x{git status} =~ /Changes not staged for commit/
-      Rake::Task['quandl:bump:version'].execute( severity: args[:severity] )
+      fail 'Must be a git repo.' if `git status 2>&1` =~ /Not a git repository/
+      fail 'You have unstaged commits.' if `git status` =~ /Changes not staged for commit/
+      Rake::Task['quandl:bump:version'].execute(severity: args[:severity])
       Rake::Task['quandl:changelog:update'].execute
     end
-    
-    task :version, :severity do |t, args|
+
+    task :version, :severity do |_t, args|
       severity = args[:severity]
       # extract version info
-      major, minor, patch = gemc.version.split(".")
+      major, minor, patch = gemc.version.split('.')
       # bump
       case severity.to_sym
-      when :major then 
+      when :major then
         major = major.to_i + 1
         minor = 0
         patch = 0
-        
-      when :minor then 
+
+      when :minor then
         minor = minor.to_i + 1
         patch = 0
-        
-      when :patch then 
+
+      when :patch then
         patch = patch.to_i + 1
       end
       # commit
-      new_version = [major, minor, patch].join(".")
-      File.write( gemc.version_path, new_version )
+      new_version = [major, minor, patch].join('.')
+      File.write(gemc.version_path, new_version)
       system("git add #{gemc.version_path}; git commit -m 'Version bump to #{new_version}'")
     end
-    
-    
+
   end
-  
+
   namespace :changelog do
-    task :update do |t, args|
+    task :update do |_t, _args|
       # collect commits that match JIRA syntax
       since = gemc.version_with_prefix
-      commits = gemc.changelog_matching.collect do |matching|
-        %x{ git --no-pager log #{since}..HEAD --pretty=oneline --grep='#{matching}'}
+      commits = gemc.changelog_matching.map do |matching|
+        ` git --no-pager log #{since}..HEAD --pretty=oneline --grep='#{matching}'`
       end.join
       # split newlines and exclude reference, select uniq
-      commits = commits.split("\n").collect{|c| "* #{c[41..-1]}" }.uniq
+      commits = commits.split("\n").map { |c| "* #{c[41..-1]}" }.uniq
       # compose prepend string
       new_version = File.read('VERSION')
       commits = "## #{new_version} \n\n" + commits.join("\n") + "\n\n\n\n"
       # prepend to UPGRADE.md
       changelog = gemc.changelog_path
-      puts "Appending commits matching #{gemc.changelog_matching.join(" ")} to #{changelog}\n#{commits}"
+      puts "Appending commits matching #{gemc.changelog_matching.join(' ')} to #{changelog}\n#{commits}"
       # check for existing changes
-      existing_changes = File.exists?(changelog) ? File.read( changelog ) : ''
-      File.write( changelog, commits + existing_changes )
+      existing_changes = File.exist?(changelog) ? File.read(changelog) : ''
+      File.write(changelog, commits + existing_changes)
       system("git add #{changelog}; git commit -m 'Updated changelog with commits from #{new_version}'")
     end
   end
-  
-end
+
+end

metadata

@@ -1,14 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: quandl_utility
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Blake Hilscher
+- Jason Byck
+- Najwa Azer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-05 00:00:00.000000000 Z
+date: 2014-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -81,19 +83,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: slack-notifier
+  name: quandl-slack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -204,7 +206,6 @@ files:
 - lib/quandl/utility/thor_tasks.rb
 - lib/quandl/utility/thor_tasks/ci.rb
 - lib/quandl/utility/thor_tasks/lint.rb
-- lib/quandl/utility/thor_tasks/notify.rb
 - lib/quandl/utility/version.rb
 - quandl_utility.gemspec
 - spec/spec_helper.rb

data/lib/quandl/utility/thor_tasks/notify.rb

@@ -1,35 +0,0 @@
-require 'slack-notifier'
-
-module Quandl
-  module Utility
-    module ThorTasks
-      # Tasks for sending notifications
-      class Notify < Thor
-        namespace 'qutil:notify'
-
-        method_option :emoji,
-          type: :string,
-          aliases: '-e',
-          required: false,
-          banner: 'EMOJI'
-        method_option :webhook,
-          type: :string,
-          aliases: '-w',
-          required: true,
-          default: ENV['SLACK_WEBHOOK'],
-          banner: 'WEBHOOK'
-        method_option :botname,
-          type: :string,
-          aliases: '-b',
-          required: false,
-          default: ENV['SLACK_BOTNAME'],
-          banner: 'BOTNAME'
-        desc 'slack message channel', 'Send notification to slack'
-        def slack(message, channel)
-          slack_client = Slack::Notifier.new(options[:webhook], channel: channel, username: options[:botname])
-          slack_client.ping(message, icon_emoji: options[:emoji])
-        end
-      end
-    end
-  end
-end