midwire_common 0.1.9 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5da67bc5fb2262d2499c04aa0f873cb27ac6b2f4
-  data.tar.gz: 34b348ccd6c0026a7574ed73687199b98d392d70
+  metadata.gz: b2d9f52a8ea1e5c417dedc8b47d671080df6aacd
+  data.tar.gz: 74b18476d79fd954b1318402323fe788bbee45da
 SHA512:
-  metadata.gz: 6b6f1d4ba80fb18e2c5c0e90a9106b22b27a880bef6bc922e04cfa6562c239617b10e6e08022e1be514004e962dda7c1493c8855194ea5ba308be5369dad7506
-  data.tar.gz: e748deb30355bab169231a6ef3a461691086c787d4772f17f4eb608f100173006698be066fa9f10147ab8cd24aafe0f167485dd4d875e6aa9ec2beef4bd21d03
+  metadata.gz: 918873e38253dbfcc7693b30af5af984d88c5042ae4c6f0c27334826512d9865d0c1f080adc39e95a11ca388f60a6a5b3350a4a84abae5c27556bf409e52115b
+  data.tar.gz: a584a6861730bd4620fb8c431ad127513a05ae40e7b25c74a82f8968bf06a255a38169575f35672d9e9b032b0da40275c4f95d87eb963295126b69b6e88e3bf4

data/.gitignore

@@ -16,4 +16,5 @@ test/tmp
 test/version_tmp
 tmp
 vendor/ruby
-/vendor/
+/vendor/
+.rubocop.yml

data/CHANGELOG

@@ -1,3 +1,12 @@
+*0.1.11* (November 21, 2014)
+
+* Fixed a bad release in 0.1.10
+
+*0.1.10* (November 21, 2014)
+
+* Fixed some rubocop issues
+* Removed the ruby_prof dependency
+
 *0.1.9* (September 19, 2014)
 
 * Change space-padding for the hour to zero-padding, for the Time.timestamp method.

data/Guardfile

@@ -1,5 +1,11 @@
 guard 'rspec', :cli => '--color --format doc', all_on_start: false, all_after_pass: false do
   watch(%r{^spec/.+_spec\.rb$})
+  watch('spec/spec_helper.rb')  { 'spec' }
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
-  watch('spec/spec_helper.rb')  { "spec" }
+  watch(%r{^lib/midwire_common/all.rb$})     { 'spec' }
+end
+
+guard :rubocop do
+  watch(%r{.+\.rb$})
+  watch(%r{(?:.+/)?\.rubocop\.yml$}) { |m| File.dirname(m[0]) }
 end

data/README.md

@@ -1,6 +1,6 @@
 # Midwire Common Gem
 
-**Version: 0.1.9**
+**Version: 0.1.11**
 
 A handy Ruby library for Midwire development
 

data/lib/midwire_common/all.rb

@@ -6,5 +6,6 @@ require 'midwire_common/fixnum'
 require 'midwire_common/float'
 require 'midwire_common/hash'
 require 'midwire_common/string'
+require 'midwire_common/system_command'
 require 'midwire_common/time'
 require 'midwire_common/time_tool'

data/lib/midwire_common/array.rb

@@ -1,20 +1,20 @@
 class Array
   def count_occurrences
     k = Hash.new(0)
-    self.each{|x| k[x] += 1}
+    each { |x| k[x] += 1 }
     k
   end
 
   def randomize
-    self.sort_by { rand }
+    sort_by { rand }
   end
 
   def randomize!
-    self.replace(self.randomize)
+    replace(randomize)
   end
 
   def sort_case_insensitive
-    self.sort_by {|x| x.downcase}
+    self.sort_by { |x| x.downcase }
   end
 
   def each_with_first_last(first_code, main_code, last_code)
@@ -41,9 +41,8 @@ class Array
   # => <table><tr><td>1</td><td>2</td></tr><tr><td>2</td><td>3</td></tr></table>
   def superjoin(*ldescr)
     d, rest = ldescr[0], ldescr[1..-1]
-    d[0] + self.map {|a|
+    d[0] + map do |a|
       (a.respond_to?(:superjoin) && rest.length > 0) ? a.superjoin(*rest) : a.to_s
-    }.join(d[1]) + d[2]
+    end.join(d[1]) + d[2]
   end
-
 end

data/lib/midwire_common/data_file_cache.rb

@@ -1,8 +1,6 @@
 module MidwireCommon
-
   # A simple class to cache data in a file
   class DataFileCache
-
     def initialize(filename)
       @cache_dir  = File.dirname(filename)
       @cache_file = normalize_filename(filename)
@@ -12,7 +10,7 @@ module MidwireCommon
     def put(data)
       x = data.dup
       x = x.join("\n") if x.is_a? Array
-      File.open(@cache_file, 'w') {|file| file.write(x)}
+      File.open(@cache_file, 'w') { |file| file.write(x) }
     end
 
     def get
@@ -20,24 +18,21 @@ module MidwireCommon
     end
 
     def age
-      return 99999999.0 unless File.exists?(@cache_file)
+      return 999_999_99.0 unless File.exist?(@cache_file)
       (Time.now - File.ctime(@cache_file)).to_f
     end
 
-    ########################################
     private
 
-      def ensure_cache_dir
-        FileUtils::mkdir_p(@cache_dir) unless File.exists?(@cache_dir)
-      end
+    def ensure_cache_dir
+      FileUtils::mkdir_p(@cache_dir) unless File.exist?(@cache_dir)
+    end
 
-      def normalize_filename(filename)
-        unless filename.match(Regexp.new(@cache_dir))
-          filename = "#{@cache_dir}/#{filename}"
-        end
-        return filename
+    def normalize_filename(filename)
+      unless filename.match(Regexp.new(@cache_dir))
+        filename = "#{@cache_dir}/#{filename}"
       end
-
+      filename
+    end
   end
-
 end

data/lib/midwire_common/rake_helper.rb

@@ -2,14 +2,13 @@ require 'thor'
 require 'midwire_common'
 
 module MidwireCommon
-
   # RakeHelper helps to automate gem release and versioning tasks
   class RakeHelper
     include Rake::DSL if defined? Rake::DSL
 
     def self.install_tasks(opts = {})
       dir = opts[:dir] || Dir.pwd
-      self.new(dir).install
+      new(dir).install
     end
 
     attr_reader :base
@@ -19,7 +18,7 @@ module MidwireCommon
     end
 
     def install
-      task_dir = File.expand_path("../tasks", File.dirname(__FILE__))
+      task_dir = File.expand_path('../tasks', File.dirname(__FILE__))
       Dir["#{task_dir}/*.rake"].sort.each { |ext| load ext }
     end
 
@@ -37,7 +36,11 @@ module MidwireCommon
     def install_gem
       built_gem_path = build_gem
       out, _ = sh_with_code("gem install '#{built_gem_path}'")
-      raise "Couldn't install gem, run `gem install #{built_gem_path}' for more detailed output" unless out[/Successfully installed/]
+      msg = <<-string.here_with_pipe
+        |Couldn't install gem, run `gem install #{built_gem_path}'
+        | for more detailed output
+      string
+      fail msg unless out[/Successfully installed/]
       Bundler.ui.confirm "#{name} (#{version}) installed"
     end
 
@@ -45,52 +48,58 @@ module MidwireCommon
       guard_clean
       guard_already_tagged
       built_gem_path = build_gem
-      tag_version {
+      tag_version do
         git_push
         rubygem_push(built_gem_path)
-      }
+      end
     end
 
-    ##################################################
     protected
 
     def rubygem_push(path)
-      if Pathname.new("~/.gem/credentials").expand_path.exist?
+      if Pathname.new('~/.gem/credentials').expand_path.exist?
         sh("gem push '#{path}'")
         Bundler.ui.confirm "Pushed #{name} #{version} to rubygems.org"
       else
-        raise "Your rubygems.org credentials aren't set. Run `gem push` to set them."
+        fail <<-string.here_with_pipe
+          |Your rubygems.org credentials aren't set.
+          | Run `gem push` to set them.
+        string
       end
     end
 
     def built_gem_path
-      Dir[File.join(base, "#{name}-*.gem")].sort_by{|f| File.mtime(f)}.last
+      Dir[File.join(base, "#{name}-*.gem")].sort_by { |f| File.mtime(f) }.last
     end
 
     def git_push
       perform_git_push
       perform_git_push ' --tags'
-      Bundler.ui.confirm "Pushed git commits and tags"
+      Bundler.ui.confirm 'Pushed git commits and tags'
     end
 
     def perform_git_push(options = '')
       cmd = "git push #{options}"
       out, code = sh_with_code(cmd)
-      raise "Couldn't git push. `#{cmd}' failed with the following output:\n\n#{out}\n" unless code == 0
+      msg = <<-string.here_with_pipe
+        |Couldn't git push. `#{cmd}' failed with the following output:\n\n
+        |#{out}\n
+      string
+      fail msg unless code == 0
     end
 
     def guard_already_tagged
-      if sh('git tag').split(/\n/).include?(version_tag)
-        raise("This tag has already been committed to the repo.")
-      end
+      already_included = sh('git tag').split(/\n/).include?(version_tag)
+      msg = 'This tag has already been committed to the repo.'
+      fail(msg) if already_included
     end
 
     def guard_clean
-      clean? or raise("There are files that need to be committed first.")
+      clean? || fail('There are files that need to be committed first.')
     end
 
     def clean?
-      sh_with_code("git diff --exit-code")[1] == 0
+      sh_with_code('git diff --exit-code')[1] == 0
     end
 
     def tag_version
@@ -105,19 +114,23 @@ module MidwireCommon
 
     def sh(cmd, &block)
       out, code = sh_with_code(cmd, &block)
-      code == 0 ? out : raise(out.empty? ? "Running `#{cmd}' failed. Run this command directly for more detailed output." : out)
+      msg = <<-string.here_with_pipe
+        |Running `#{cmd}' failed.
+        | Run this command directly for more detailed output.
+      string
+      code == 0 ? out : raise(out.empty? ? msg : out)
     end
 
     def sh_with_code(cmd, &block)
-      cmd << " 2>&1"
+      cmd << ' 2>&1'
       outbuf = ''
       Bundler.ui.debug(cmd)
-      Dir.chdir(base) {
+      Dir.chdir(base) do
         outbuf = `#{cmd}`
         if $? == 0
           block.call(outbuf) if block
         end
-      }
+      end
       [outbuf, $?]
     end
   end

data/lib/midwire_common/version.rb

@@ -1,6 +1,6 @@
 original_verbosity = $VERBOSE
 $VERBOSE = nil
 module MidwireCommon
-  VERSION = "0.1.9"
+  VERSION = "0.1.11"
 end
 $VERBOSE = original_verbosity

data/midwire_common.gemspec

@@ -20,8 +20,8 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "guard"
   gem.add_development_dependency "guard-bundler"
   gem.add_development_dependency "guard-rspec"
+  gem.add_development_dependency "guard-rubocop"
   gem.add_development_dependency "pry"
   gem.add_development_dependency "rake"
-
-  gem.add_runtime_dependency "ruby-prof"
+  gem.add_development_dependency "rubocop"
 end

data/spec/lib/midwire_common/string_spec.rb

@@ -4,25 +4,25 @@
 require 'spec_helper'
 
 describe String do
-  it "is a String" do
+  it 'is a String' do
     String.new.should be_a String
   end
 
-  it "generates a random string" do
+  it 'generates a random string' do
     String.random.length.should == 6
   end
 
-  context "slicing methods" do
+  context 'slicing methods' do
     it "'left' returns the leftmost 'n' characters" do
-      "My Bogus String".left(2).should == "My"
+      'My Bogus String'.left(2).should == 'My'
     end
 
     it "'right' returns the rightmost 'n' characters " do
-      "My Bogus String".right(2).should == "ng"
+      'My Bogus String'.right(2).should == 'ng'
     end
   end
 
-  context "trim method" do
+  context 'trim method' do
     it "'left_trim' removes all whitespace from the left of the string" do
       " \t = this is a string".left_trim.should == '= this is a string'
     end
@@ -83,38 +83,39 @@ describe String do
     end
 
     it 'format_phone returns a formatted phone number string' do
-      '9132329999'.format_phone.should == '(913)232-9999'
-      '913.232.9999'.format_phone.should == '(913)232-9999'
-      '913 232 9999'.format_phone.should == '(913)232-9999'
-      '913-232-9999'.format_phone.should == '(913)232-9999'
+      expect('9132329999'.format_phone).to eq('(913)232-9999')
+      expect('913.232.9999'.format_phone).to eq('(913)232-9999')
+      expect('913 232 9999'.format_phone).to eq('(913)232-9999')
+      expect('913-232-9999'.format_phone).to eq('(913)232-9999')
     end
 
     it 'sanitizes itself' do
-      '|bogus|'.sanitize.should == 'bogus'
-      '|∫|ß'.sanitize.should == ''
-      'ßogus'.sanitize.should == 'ogus'
-      '<tag>bogus</tag>'.sanitize.should == 'tagbogustag'
-      '<tag>.bogus.</tag>'.sanitize.should == 'tag.bogus.tag'
+      expect('|bogus|'.sanitize).to eq('bogus')
+      expect('|∫|ß'.sanitize).to eq('')
+      expect('ßogus'.sanitize).to eq('ogus')
+      expect('<tag>bogus</tag>'.sanitize).to eq('tagbogustag')
+      expect('<tag>.bogus.</tag>'.sanitize).to eq('tag.bogus.tag')
       s = '|∫|ß'
       s.sanitize!
       s.should == ''
     end
 
     it 'shortens itself with elipses at the end' do
+      #
       s = 'this is my very long string which I will eventually shorten with the enhanced String class that we are now testing.'
       short = s.shorten
-      short.should == 'this is my very long string...'
-      short.length.should == 30
+      expect(short).to eq('this is my very long string...')
+      expect(short.length).to eq(30)
 
       s = '1234567890123456789012345678901234567890'
       short = s.shorten
-      short.should == '123456789012345678901234567...'
-      short.length.should == 30
+      expect(short).to eq('123456789012345678901234567...')
+      expect(short.length).to eq(30)
 
       s = '12345678901234567890'
       short = s.shorten
-      short.should == '12345678901234567890'
-      short.length.should == 20
+      expect(short).to eq('12345678901234567890')
+      expect(short.length).to eq(20)
     end
 
     context 'quotes' do
@@ -123,7 +124,8 @@ describe String do
       end
 
       it 'escapes double quotes' do
-        'this is a "test"'.escape_double_quotes.should == "this is a \\\\\"test\\\\\""
+        expect('this is a "test"'.escape_double_quotes)
+          .to eq("this is a \\\\\"test\\\\\"")
       end
     end
   end

data/spec/lib/midwire_common/time_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
 describe Time do
-  it "generates a timestamp, appropriate for a filename" do
+  it 'generates a timestamp, appropriate for a filename' do
     ts = Time.timestamp
-    ts.length.should == 14
-    ts.is_alpha_numeric?.should be_true
-    ts.is_numeric?.should be_true
+    expect(ts.length).to eq(14)
+    expect(ts.is_alpha_numeric?).to be_true
+    expect(ts.is_numeric?).to be_true
   end
 end

data/spec/lib/midwire_common/time_tool_spec.rb

@@ -1,13 +1,13 @@
-require "spec_helper"
+require 'spec_helper'
 
 describe MidwireCommon::TimeTool do
 
-  it "converts seconds to timestamp" do
-    MidwireCommon::TimeTool.seconds_to_time(92353).should == "25:39:13"
+  it 'converts seconds to timestamp' do
+    MidwireCommon::TimeTool.seconds_to_time(92_353).should == '25:39:13'
   end
 
-  it "converts timestamp to seconds" do
-    MidwireCommon::TimeTool.time_to_seconds("25:39:13").should == 92353
+  it 'converts timestamp to seconds' do
+    MidwireCommon::TimeTool.time_to_seconds('25:39:13').should == 92_353
   end
 
 end

data/spec/spec_helper.rb

@@ -1,21 +1,23 @@
 if ENV['COVERAGE']
   require 'simplecov'
   SimpleCov.start do
-    add_filter "spec/"
-    add_filter "vendor/"
+    add_filter 'spec/'
+    add_filter 'vendor/'
   end
 end
 
-require "pry"
+require 'pry'
 require File.join(File.dirname(__FILE__), '..', 'lib', 'midwire_common')
-require "midwire_common/all"
+require 'midwire_common/all'
 
 PROJECT_ROOT = File.expand_path('..', File.dirname(__FILE__))
 
 RSpec.configure do |config|
+  include MidwireCommon
+
   config.mock_with :rspec
   config.color_enabled = true
-  config.order         = "random"
+  config.order         = 'random'
 
   def capture(stream)
     begin

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: midwire_common
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.11
 platform: ruby
 authors:
 - Chris Blackburn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-19 00:00:00.000000000 Z
+date: 2014-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -109,13 +123,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ruby-prof
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements: