diff
stringlengths
65
26.7k
message
stringlengths
7
9.92k
diff --git a/spec/resolver/basic_spec.rb b/spec/resolver/basic_spec.rb index abc1234..def5678 100644 --- a/spec/resolver/basic_spec.rb +++ b/spec/resolver/basic_spec.rb @@ -10,6 +10,6 @@ it "resolves" do dep "rack" - should_resolve_as [gem "rack", "1.1"] + should_resolve_as [gem("rack"), "1.1"] end end
Fix syntax error on 1.9
diff --git a/lib/rom/repository/command_proxy.rb b/lib/rom/repository/command_proxy.rb index abc1234..def5678 100644 --- a/lib/rom/repository/command_proxy.rb +++ b/lib/rom/repository/command_proxy.rb @@ -1,5 +1,7 @@ module ROM class Repository + # TODO: look into making command graphs work without the root key in the input + # so that we can get rid of this wrapper class CommandProxy attr_reader :command, :root
Add a TODO to CommandProxy
diff --git a/lib/tasks/personal_information.rake b/lib/tasks/personal_information.rake index abc1234..def5678 100644 --- a/lib/tasks/personal_information.rake +++ b/lib/tasks/personal_information.rake @@ -1,7 +1,9 @@ namespace :anonymise do desc 'Anonymise data that is at least 6 months old' task remove_old_personal_information: :environment do + Rails.logger.info 'Beginning anonymising old data' cutoff = Time.zone.now - 6.months Depersonalizer.new.remove_personal_information cutoff + Rails.logger.info 'Completed anonymising old data' end end
Add logging information to rake task
diff --git a/app/controllers/components/course/duplication_component.rb b/app/controllers/components/course/duplication_component.rb index abc1234..def5678 100644 --- a/app/controllers/components/course/duplication_component.rb +++ b/app/controllers/components/course/duplication_component.rb @@ -2,7 +2,7 @@ include Course::ControllerComponentHost::Component def sidebar_items - return [] unless can?(:manage, current_course) + return [] unless current_user.administrator? [ { key: :duplication,
Hide duplication sidebar item from non-administrators. Duplication UX is not ready for end users yet.
diff --git a/lib/cms/hippo_importer/corporate_page.rb b/lib/cms/hippo_importer/corporate_page.rb index abc1234..def5678 100644 --- a/lib/cms/hippo_importer/corporate_page.rb +++ b/lib/cms/hippo_importer/corporate_page.rb @@ -2,11 +2,11 @@ module HippoImporter class CorporatePage < HippoImporter::Base def hippo_type - 'contentauthoringwebsite:Static' + 'contentauthoringwebsite:StaticPage' end def layout - @layout ||= site.layouts.find_by(identifier: 'corporate_article') + @layout ||= site.layouts.find_by(identifier: 'corporate') end end end
Fix typos for corporate pages on hippo migration
diff --git a/lib/cognitive_vision/analyze_response.rb b/lib/cognitive_vision/analyze_response.rb index abc1234..def5678 100644 --- a/lib/cognitive_vision/analyze_response.rb +++ b/lib/cognitive_vision/analyze_response.rb @@ -3,7 +3,7 @@ attr_reader :adult, :faces def initialize(options = {}) - @adult = options.fetch(:adult, {}) + @adult = options.fetch(:adult, nil) @faces = options.fetch(:faces, []) end
Make adult nil if it dont exists
diff --git a/lib/dmm-crawler/ranking/dojin_ranking.rb b/lib/dmm-crawler/ranking/dojin_ranking.rb index abc1234..def5678 100644 --- a/lib/dmm-crawler/ranking/dojin_ranking.rb +++ b/lib/dmm-crawler/ranking/dojin_ranking.rb @@ -8,7 +8,7 @@ def initialize(agent:, submedia: nil, term: nil) @agent = discriminate_agent(agent) @submedia = submedia - @term = submedia + @term = term @url = File.join(BASE_URL, "/dc/doujin/-/ranking-all/=/sort=popular/submedia=#{@submedia}/term=#{@term}") end
Fix a typo where it inserts submedia into term instance variable
diff --git a/lib/gov_kit/search_engines/technorati.rb b/lib/gov_kit/search_engines/technorati.rb index abc1234..def5678 100644 --- a/lib/gov_kit/search_engines/technorati.rb +++ b/lib/gov_kit/search_engines/technorati.rb @@ -4,7 +4,7 @@ def self.search(options=[]) query = options.to_query('q') host = "api.technorati.com" - path = "/search?key=#{API_KEYS["technorati_api_key"]}&limit=50&language=en&query=#{URI::encode(query)}" + path = "/search?key=#{GovKit::configuration.technorati_api_key}&limit=50&language=en&query=#{URI::encode(query)}" html = make_request(host, path) doc = Hpricot(Iconv.conv('utf-8//IGNORE', 'gb2312',html))
Replace reference to API_KEYS with GovKit::configuration
diff --git a/lib/lazy/pp/json/version.rb b/lib/lazy/pp/json/version.rb index abc1234..def5678 100644 --- a/lib/lazy/pp/json/version.rb +++ b/lib/lazy/pp/json/version.rb @@ -1,6 +1,8 @@+# -*- coding: utf-8 -*- + module Lazy module PP - module JSON + class JSON < String VERSION = "0.0.1" end end
Fix class type from module to class
diff --git a/lib/slack/real_time/concurrency/async.rb b/lib/slack/real_time/concurrency/async.rb index abc1234..def5678 100644 --- a/lib/slack/real_time/concurrency/async.rb +++ b/lib/slack/real_time/concurrency/async.rb @@ -6,15 +6,7 @@ module Async class Client < ::Async::WebSocket::Client extend ::Forwardable - def_delegators :@driver, :on - - def text(message) - @driver.text(message) - end - - def binary(data) - @driver.binary(data) - end + def_delegators :@driver, :on, :text, :binary end class Socket < Slack::RealTime::Socket
Use def_delegators for text and binary.
diff --git a/lib/yummydata/criteria/execution_time.rb b/lib/yummydata/criteria/execution_time.rb index abc1234..def5678 100644 --- a/lib/yummydata/criteria/execution_time.rb +++ b/lib/yummydata/criteria/execution_time.rb @@ -47,13 +47,12 @@ start_time = Time.now result = @client.query(sparql_query) + return nil if result.nil? end_time = Time.now rescue => e return nil end - - return nil if result.nil? end_time - start_time end
Change the timing to return nil
diff --git a/lib/primer/table_printer.rb b/lib/primer/table_printer.rb index abc1234..def5678 100644 --- a/lib/primer/table_printer.rb +++ b/lib/primer/table_printer.rb @@ -1,28 +1,27 @@ module Primer class TablePrinter - attr_reader :rows, :primes, :cell_width - private :rows, :primes, :cell_width + attr_reader :table, :cell_width + private :table, :cell_width - def initialize(primes:, rows:) - @primes = primes - @rows = rows - @cell_width = rows.last.last.to_s.size + def initialize(table) + @table = table + @cell_width = table.largest_prime.to_s.size end - def print_multiplication_table + def print_table $stdout.puts(headers) $stdout.puts('-' * headers.size) - print_table + print_rows end private def headers - cell('N') + '| ' + primes.map(&method(:cell)).join(' ') + cell('N') + '| ' + table.primes.map(&method(:cell)).join(' ') end - def print_table - rows.zip(primes).each do |row, prime| + def print_rows + table.rows.zip(table.primes).each do |row, prime| $stdout.puts(cell(prime) + '| ' + row.map(&method(:cell)).join(' ')) end end
Make table printer take the table object
diff --git a/lib/facter/nr_ruby_found.rb b/lib/facter/nr_ruby_found.rb index abc1234..def5678 100644 --- a/lib/facter/nr_ruby_found.rb +++ b/lib/facter/nr_ruby_found.rb @@ -1,9 +1,13 @@ Facter.add(:nr_ruby_found) do confine :kernel => :linux setcode do - ruby = Facter::Util::Resolution.exec('which ruby') + if File.exists?('/opt/puppet/bin/ruby') + ruby = '/opt/puppet/bin/ruby' + else + ruby = Facter::Util::Resolution.exec('which --skip-alias ruby 2> /dev/null') + end if ruby - version = Facter::Util::Resolution.exec("ruby -e 'puts RUBY_VERSION'") + version = Facter::Util::Resolution.exec( ruby + " -e 'puts RUBY_VERSION'") version.start_with?('1.8.7', '1.9', '2.0') else false
Support Puppet's embedded ruby and improve the which command usage
diff --git a/lib/frecon/request_error.rb b/lib/frecon/request_error.rb index abc1234..def5678 100644 --- a/lib/frecon/request_error.rb +++ b/lib/frecon/request_error.rb @@ -10,10 +10,7 @@ require "json" class RequestError < StandardError - attr_reader :code - attr_reader :body - - def initialize(code, message = nil, context = "No context provided!") + def initialize(code, message = nil, context = nil) @code = code @message = message @context = context
Remove attr_readers, use nil default context We do not need the attr_readers because outside of the class the return_value method is called which gets the values internally. A nil default context is more concise than defaulting to an error message because if someone sees "context": null, they will understand that there is no context.
diff --git a/lib/jiraSOAP/JIRAservice.rb b/lib/jiraSOAP/JIRAservice.rb index abc1234..def5678 100644 --- a/lib/jiraSOAP/JIRAservice.rb +++ b/lib/jiraSOAP/JIRAservice.rb @@ -24,6 +24,10 @@ #PONDER: a finalizer that will try to logout + def method_missing(method, *args) + $stderr.puts "#{method} is not a defined method in the API...yet" + end + protected def on_create_document(doc) doc.alias 'soap', 'http://soap.rpc.jira.atlassian.com'
Add method_missing to let users know when something is not working To be a bit more friendly. :)
diff --git a/lib/ui_bibz/rails/engine.rb b/lib/ui_bibz/rails/engine.rb index abc1234..def5678 100644 --- a/lib/ui_bibz/rails/engine.rb +++ b/lib/ui_bibz/rails/engine.rb @@ -25,7 +25,11 @@ end initializer 'font-awesome-sass.assets.precompile', group: :all do |app| - config.assets.precompile << /\.(?:svg|eot|woff|woff2|ttf)\z/ + %w[eot svg ttf woff woff2].each do |ext| + app.config.assets.precompile << "fonts/fa-brands-400.#{ext}" + app.config.assets.precompile << "fonts/fa-regular-400.#{ext}" + app.config.assets.precompile << "fonts/fa-solid-900.#{ext}" + end end config.after_initialize do
Add compatibility with Sprockets 4 See https://github.com/rails/sprockets-rails/issues/269
diff --git a/metadata.rb b/metadata.rb index abc1234..def5678 100644 --- a/metadata.rb +++ b/metadata.rb @@ -10,3 +10,7 @@ %w{ubuntu debian centos redhat amazon scientific fedora}.each do |os| supports os end +recipe 'zsh::default', 'Installs zsh.' + +source_url 'https://github.com/opscode-cookbooks/zsh' if respond_to?(:source_url) +issues_url 'https://github.com/opscode-cookbooks/zsh/issues' if respond_to?(:source_url)
Add source_url and issues_url metata for Chef 12
diff --git a/metadata.rb b/metadata.rb index abc1234..def5678 100644 --- a/metadata.rb +++ b/metadata.rb @@ -2,7 +2,7 @@ maintainer 'Peter Donald' maintainer_email 'peter@realityforge.org' license 'Apache 2.0' -description 'Install and configure the collectd monitoring daemon and plugins' +description 'Install and configure the collectd monitoring daemon and plugin configurations' long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) version '1.1.5'
Improve the description a whisker
diff --git a/metadata.rb b/metadata.rb index abc1234..def5678 100644 --- a/metadata.rb +++ b/metadata.rb @@ -1,7 +1,7 @@ name 'sys' maintainer 'GSI HPC department' maintainer_email 'hpc@gsi.de' -license 'Apache 2.0' +license 'Apache-2.0' description 'System Software configuration and maintenance' long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) if respond_to?(:source_url)
Use official SPDX identifier for the license
diff --git a/metadata.rb b/metadata.rb index abc1234..def5678 100644 --- a/metadata.rb +++ b/metadata.rb @@ -14,7 +14,7 @@ supports 'redhat', '>= 7.0' chef_version '>= 14.0' -depends 'java', '>= 1.39' -depends 'runit', '>= 1.7' +depends 'java', '< 7.0.0' +depends 'runit', '~> 5.1' depends 'magic', '>= 1.1' -depends 'ark', '>= 1.0' +depends 'ark', '~> 5.0'
fix: Set dep versions for Chef 14 compatibility java >= 7.0.0 requires Chef 15 or above The other cookbooks may require Chef >= 15 in the future, so this avoids that.
diff --git a/lol2dict.rb b/lol2dict.rb index abc1234..def5678 100644 --- a/lol2dict.rb +++ b/lol2dict.rb @@ -3,9 +3,6 @@ $KCODE = 'UTF8' require 'yaml' - -require 'rubygems' -gem 'builder', '~> 2.0' class Hash def to_apple_dictionary(io = STDOUT)
Remove unused dependency on builder
diff --git a/metadata.rb b/metadata.rb index abc1234..def5678 100644 --- a/metadata.rb +++ b/metadata.rb @@ -8,7 +8,7 @@ recipe 'passenger_apache2', 'Installs Passenger as an Apache module' recipe 'passenger_apache2::mod_rails', 'Enables Apache module configuration for passenger module' -depends 'apache2', '~> 1.0' +depends 'apache2', '>= 2.0' depends 'build-essential' %w( redhat centos scientific amazon oracle ubuntu debian arch ).each do |os|
Update Apache dependency from ~1.0 to >= 2.0 2.0+ brings with it Apache 2.4 support so we can support RHEL 7 and Ubuntu 14.04
diff --git a/metadata.rb b/metadata.rb index abc1234..def5678 100644 --- a/metadata.rb +++ b/metadata.rb @@ -10,4 +10,4 @@ if respond_to?(:issues_url) issues_url 'https://github.com/GSI-HPC/sys-chef-cookbook/issues' end -version '1.40.4' +version '1.40.5'
Revert changes that are incompatible with Chef 12.0
diff --git a/metadata.rb b/metadata.rb index abc1234..def5678 100644 --- a/metadata.rb +++ b/metadata.rb @@ -18,7 +18,7 @@ license 'Apache 2.0' description 'Installs/Configures authbind and defines resources for managing authorization' long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version '0.1.3' +version '0.1.4' %w{ ubuntu debian }.each do |os| supports os
Bump version in preparation for release
diff --git a/metadata.rb b/metadata.rb index abc1234..def5678 100644 --- a/metadata.rb +++ b/metadata.rb @@ -10,7 +10,7 @@ depends 'build-essential' -%w(ubuntu debian redhat centos scientific oracle amazon).each do |os| +%w( amazon debian ubuntu redhat centos scientific fedora oracle ).each do |os| supports os end
Add fedora to list of platforms
diff --git a/metadata.rb b/metadata.rb index abc1234..def5678 100644 --- a/metadata.rb +++ b/metadata.rb @@ -20,5 +20,5 @@ depends 'ark', '= 0.8.0' depends 'java', '= 1.22.0' depends 'elasticsearch', '= 0.3.8' -depends 'mongodb', '= 0.14.7' +depends 'mongodb', '= 0.14.8' depends 'nginx', '= 2.2.0'
Fix mongodb version number due to mistagging of mongodb author
diff --git a/metadata.rb b/metadata.rb index abc1234..def5678 100644 --- a/metadata.rb +++ b/metadata.rb @@ -8,4 +8,4 @@ long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) version '2.0.2' supports 'windows' -depends 'windows', '~> 2.1.1' +depends 'windows', '>= 1.2.2, < 3.0'
Add 1.2.2 version of `windows` cookbook to dependencies Doesn't force users to upgrade to 2.x version of `windows` cookbook.
diff --git a/metadata.rb b/metadata.rb index abc1234..def5678 100644 --- a/metadata.rb +++ b/metadata.rb @@ -1,7 +1,7 @@ name 'sqlite' maintainer 'Chef Software, Inc.' maintainer_email 'cookbooks@chef.io' -license 'Apache 2.0' +license 'Apache-2.0' description 'Installs sqlite' long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) version '1.1.3'
Use a SPDX standard license string Signed-off-by: Tim Smith <764ef62106582a09ed09dfa0b6bff7c05fd7d1e4@chef.io>
diff --git a/metadata.rb b/metadata.rb index abc1234..def5678 100644 --- a/metadata.rb +++ b/metadata.rb @@ -16,7 +16,7 @@ depends 'build-essential' depends 'java', '~> 1.35' -depends 'runit', '~> 3.0' +depends 'runit', '~> 4.0' depends 'zookeeper', '~> 8.0' depends 'magic', '~> 1.5' depends 'et_gradle', '~> 2.0'
Upgrade runit dependency to 4.x https://supermarket.chef.io/cookbooks/runit#changelog
diff --git a/metadata.rb b/metadata.rb index abc1234..def5678 100644 --- a/metadata.rb +++ b/metadata.rb @@ -4,7 +4,7 @@ license "MIT" description "Configures monit" long_description "Please refer to README.md" -version "1.5.3" +version "1.5.2" recipe "monit", "Sets up the service definition and default checks." recipe "monit::install_source", "Compiles and installs monit from source."
Revert "Bump version to 1.5.3." This reverts commit 24cda809dfba7789f58be68d6a0e9ddc31992f28.
diff --git a/metadata.rb b/metadata.rb index abc1234..def5678 100644 --- a/metadata.rb +++ b/metadata.rb @@ -9,3 +9,4 @@ supports 'mac_os_x' depends 'homebrew', '~> 2.1.0' +depends 'mac_os_x', '~> 1.4.6'
Add dependency for mac_os_x cookbook Again not using this yet, but will want to for defaults and plists, easier than keeping notes.
diff --git a/lxc.gemspec b/lxc.gemspec index abc1234..def5678 100644 --- a/lxc.gemspec +++ b/lxc.gemspec @@ -13,6 +13,7 @@ s.add_development_dependency 'rspec', '~> 2.6' s.add_development_dependency 'simplecov', '~> 0.4' s.add_development_dependency 'rack-test', '~> 0.6' + s.add_development_dependency 'json' s.add_runtime_dependency 'sinatra', '~> 1.3' s.add_runtime_dependency 'multi_json', '~> 1.3'
Make json gem a dev dependency
diff --git a/sandwich.rb b/sandwich.rb index abc1234..def5678 100644 --- a/sandwich.rb +++ b/sandwich.rb @@ -4,6 +4,12 @@ require 'chef/recipe' require 'chef/resource' require 'chef/providers' + +class Chef::Recipe + def from_string(string) + self.instance_eval(string, 'sandwich', 1) + end +end $client = nil @@ -18,9 +24,13 @@ rebuild_node Chef::Log.level = :debug run_context = Chef::RunContext.new($client.node, {}) -# @recipe = Chef::Recipe.new(nil, nil, run_context) + recipe = Chef::Recipe.new(nil, nil, run_context) + input = <<EOS +package "emacs23" +package "gitg" +EOS + recipe.from_string(input) Chef::Log.level = :debug - add_package_to_run_context('gitg', run_context) runrun = Chef::Runner.new(run_context).converge runrun end
Add from_string monkey patch to Chef::Recipe
diff --git a/Casks/spectacle.rb b/Casks/spectacle.rb index abc1234..def5678 100644 --- a/Casks/spectacle.rb +++ b/Casks/spectacle.rb @@ -4,8 +4,8 @@ version '0.8.6' sha256 '3e367d2d7e6fe7d5f41d717d49cb087ba7432624b71ddd91c0cfa9d5a5459b7c' else - version '0.8.9' - sha256 '11058388f4f3a2f91c7f888d8bf11017e12dea07808895d899c5b8407f679993' + version '0.8.10' + sha256 '26e4ccc906a82c5df9d1d462f1b691fce746aea43405b178d3d230fb23551d44' appcast 'http://spectacleapp.com/updates/appcast.xml', :sha256 => '5d75e2e07886ca135916e224b4b5c1468d9af1ea8ef355db33b28bff511fa6b2'
Update Spectacle.app to version 0.8.10
diff --git a/metadata.rb b/metadata.rb index abc1234..def5678 100644 --- a/metadata.rb +++ b/metadata.rb @@ -6,7 +6,7 @@ description 'Configures sysctl parameters' long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) version '0.4.0' -supports 'ubuntu', '>= 10.04' +supports 'ubuntu', '>= 12.04' supports 'debian', '>= 7.0' supports 'centos', '>= 5.9' supports 'scientific', '>= 6.4'
Update support to minimum of Ubuntu Precise
diff --git a/metadata.rb b/metadata.rb index abc1234..def5678 100644 --- a/metadata.rb +++ b/metadata.rb @@ -4,7 +4,7 @@ license 'all_rights' description 'Installs/Configures win_base' long_description 'Installs/Configures win_base' -version '0.1.1' +version '0.1.2' depends 'push-jobs' depends 'audit'
Add audit cookbook to default recipe
diff --git a/metadata.rb b/metadata.rb index abc1234..def5678 100644 --- a/metadata.rb +++ b/metadata.rb @@ -9,3 +9,4 @@ depends "apt" depends "nginx" depends "r" +depends "users"
Make sure we depends on users cookbook.
diff --git a/db/migrate/20140729080040_make_common_category.rb b/db/migrate/20140729080040_make_common_category.rb index abc1234..def5678 100644 --- a/db/migrate/20140729080040_make_common_category.rb +++ b/db/migrate/20140729080040_make_common_category.rb @@ -9,7 +9,7 @@ first_category.save end - new_category = Category.create id: 1, name: 'Greetings/Common' + new_category = Category.create id: 1, name: 'Greetings / Common' end def down
@thenathanjones: Put spaces in the name so it has somewhere to wrap
diff --git a/metadata.rb b/metadata.rb index abc1234..def5678 100644 --- a/metadata.rb +++ b/metadata.rb @@ -23,6 +23,7 @@ maintainer 'Rapid7 LLC' maintainer_email 'coreservices@rapid7.com' description 'Install and configure etcd' +source_url 'https://github.com/rapid7/chef-etcd' license 'MIT' long_description IO.read('README.md') rescue ''
Add source URL for GitHub repo
diff --git a/LXReorderableCollectionViewFlowLayout.podspec b/LXReorderableCollectionViewFlowLayout.podspec index abc1234..def5678 100644 --- a/LXReorderableCollectionViewFlowLayout.podspec +++ b/LXReorderableCollectionViewFlowLayout.podspec @@ -12,7 +12,7 @@ :git => 'https://github.com/lxcid/LXReorderableCollectionViewFlowLayout.git', :tag => '0.1.1' } - s.platform = :ios, '4.3' + s.platform = :ios, '6.0' s.source_files = 'LXReorderableCollectionViewFlowLayout/' s.public_header_files = 'LXReorderableCollectionViewFlowLayout/' s.frameworks = 'UIKit', 'CoreGraphics'
Set platform to iOS 6.0 since UICollectionView did not exist before that version.
diff --git a/Casks/brackets.rb b/Casks/brackets.rb index abc1234..def5678 100644 --- a/Casks/brackets.rb +++ b/Casks/brackets.rb @@ -1,7 +1,7 @@ class Brackets < Cask - url 'http://download.brackets.io/file.cfm?platform=OSX&build=35' + url 'http://download.brackets.io/file.cfm?platform=OSX&build=36' homepage 'http://brackets.io' - version 'Sprint 35' - no_checksum + version 'Sprint 36' + sha256 'a7cf879cb32b828b82eea76659617e0d439d2412feff205304bcebcad9f36335' link 'Brackets.app' end
Upgrade Brackets to Sprint 36
diff --git a/Casks/cocktail.rb b/Casks/cocktail.rb index abc1234..def5678 100644 --- a/Casks/cocktail.rb +++ b/Casks/cocktail.rb @@ -1,5 +1,5 @@ class Cocktail < Cask - url 'http://usa.maintain.se/CocktailMLE.dmg' + url 'http://usa.maintain.se/CocktailME.dmg' homepage 'http://maintain.se/cocktail' version 'latest' no_checksum
Use Cocktail for Mavericks as default Cocktail for Mountain Lion moved to caskroom/homebrew-versions Closes #1354
diff --git a/Casks/dnscrypt.rb b/Casks/dnscrypt.rb index abc1234..def5678 100644 --- a/Casks/dnscrypt.rb +++ b/Casks/dnscrypt.rb @@ -4,4 +4,6 @@ version '0.19' sha256 '36b684cc1a90a540e8c38759f509914818a1d3ca0e374ea0ab82e259cb72e1ec' install 'DNSCrypt.mpkg' + uninstall :pkgutil => 'com.opendns.osx.dnscryptClient.*' + uninstall :launchctl => 'com.opendns.osx.*' end
Add uninstall stanza for DNSCrypt
diff --git a/DWTagList.podspec b/DWTagList.podspec index abc1234..def5678 100644 --- a/DWTagList.podspec +++ b/DWTagList.podspec @@ -6,7 +6,7 @@ s.license = 'MIT' s.author = { "Dominic Wroblewski" => "domness@gmail.com" } s.source = { :git => "https://github.com/domness/DWTagList.git", :tag => "v0.1" } - s.platform = :ios + s.platform = :ios, '5.0' s.source_files = 'DWTagList/Classes/*.{h,m}' s.requires_arc = true end
Add platform version to podspec
diff --git a/FSCalendar.podspec b/FSCalendar.podspec index abc1234..def5678 100644 --- a/FSCalendar.podspec +++ b/FSCalendar.podspec @@ -11,7 +11,7 @@ s.source = { :git => "https://github.com/WenchaoD/FSCalendar.git", :tag => s.version.to_s } s.platform = :ios - s.ios.deployment_target = '7.0' + s.ios.deployment_target = '8.0' s.requires_arc = true s.framework = 'UIKit', 'QuartzCore' s.source_files = 'FSCalendar/*.{h,m}'
Change iOS version of .podspec to '8.0' .
diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb index abc1234..def5678 100644 --- a/test/controllers/users_controller_test.rb +++ b/test/controllers/users_controller_test.rb @@ -1,5 +1,7 @@+# Encoding: utf-8 require 'test_helper' +# User controller tests class UsersControllerTest < ActionController::TestCase setup do @user = users(:one)
Clean up user test script
diff --git a/v1/app/controllers/v1/utils_controller.rb b/v1/app/controllers/v1/utils_controller.rb index abc1234..def5678 100644 --- a/v1/app/controllers/v1/utils_controller.rb +++ b/v1/app/controllers/v1/utils_controller.rb @@ -4,7 +4,7 @@ class UtilsController < ApplicationController before_filter :authenticate - #rescue_from Exception, :with => :generic_exception_handler + rescue_from Exception, :with => :generic_exception_handler rescue_from Errno::ECONNREFUSED, :with => :connection_refused def contributor_bulk_download_links
Add generic_exception_handler rescue_from to the utils controller
diff --git a/vmdb/db/fixtures/ae_datastore/ManageIQ/Service/Provisioning/StateMachines/ServiceProvision_Template.class/__methods__/update_serviceprovision_status.rb b/vmdb/db/fixtures/ae_datastore/ManageIQ/Service/Provisioning/StateMachines/ServiceProvision_Template.class/__methods__/update_serviceprovision_status.rb index abc1234..def5678 100644 --- a/vmdb/db/fixtures/ae_datastore/ManageIQ/Service/Provisioning/StateMachines/ServiceProvision_Template.class/__methods__/update_serviceprovision_status.rb +++ b/vmdb/db/fixtures/ae_datastore/ManageIQ/Service/Provisioning/StateMachines/ServiceProvision_Template.class/__methods__/update_serviceprovision_status.rb @@ -1,12 +1,7 @@ # # Description: This method updates the service provisioning status -# Required inputs: status, status_state +# Required inputs: status # - -$evm.log("info", "===========================================") -$evm.log("info", "Listing ROOT Attributes:") -$evm.root.attributes.sort.each { |k, v| $evm.log("info", "\t#{k}: #{v}") } -$evm.log("info", "===========================================") prov = $evm.root['service_template_provision_task']
Remove root object logging from service class update status method.
diff --git a/Library/Homebrew/compat/fails_with_llvm.rb b/Library/Homebrew/compat/fails_with_llvm.rb index abc1234..def5678 100644 --- a/Library/Homebrew/compat/fails_with_llvm.rb +++ b/Library/Homebrew/compat/fails_with_llvm.rb @@ -2,10 +2,6 @@ def fails_with_llvm msg=nil, data=nil opoo "Calling fails_with_llvm in the install method is deprecated" puts "Use the fails_with DSL instead" - end - - def fails_with_llvm? - fails_with? :llvm end def self.fails_with_llvm msg=nil, data={}
Remove an internal method from compat
diff --git a/activestorage/lib/tasks/activestorage.rake b/activestorage/lib/tasks/activestorage.rake index abc1234..def5678 100644 --- a/activestorage/lib/tasks/activestorage.rake +++ b/activestorage/lib/tasks/activestorage.rake @@ -1,6 +1,6 @@ # frozen_string_literal: true -namespace :activestorage do +namespace :active_storage do desc "Copy over the migration needed to the application" task install: :environment do Rake::Task["active_storage:install:migrations"].invoke
Change namespace of Active Storage rake task
diff --git a/AMPEasyTable.podspec b/AMPEasyTable.podspec index abc1234..def5678 100644 --- a/AMPEasyTable.podspec +++ b/AMPEasyTable.podspec @@ -24,6 +24,6 @@ s.platform = :ios, "5.0" s.source = { :git => "https://github.com/alvaromurillo/AMPEasyTable.git", :tag => "0.0.1" } - s.source_files = "AMPEasyTable", "AMPEasyTable/**/*.{h,m}" - + s.source_files = "AMPEasyTable", "AMPEasyTable/**/*.{h,m}" + s.requires_arc = true end
Add arc requirement to podspec file
diff --git a/nap.gemspec b/nap.gemspec index abc1234..def5678 100644 --- a/nap.gemspec +++ b/nap.gemspec @@ -17,7 +17,13 @@ Nap is a really simple REST library. EOF - spec.files = ['lib/rest.rb', 'lib/rest/request.rb', 'lib/rest/response.rb', 'support/cacert.pem'] + spec.files = [ + 'lib/rest.rb', + 'lib/rest/error.rb', + 'lib/rest/request.rb', + 'lib/rest/response.rb', + 'support/cacert.pem' + ] spec.has_rdoc = true spec.extra_rdoc_files = ['README.md', 'LICENSE']
Add error.rb to the gem.
diff --git a/test/yt/audit_test.rb b/test/yt/audit_test.rb index abc1234..def5678 100644 --- a/test/yt/audit_test.rb +++ b/test/yt/audit_test.rb @@ -8,35 +8,26 @@ assert_equal 'Info Cards', result[0].title assert_equal 2, result[0].valid_count - assert_equal 4, result[0].total_count + assert_equal 5, result[0].total_count assert_equal 'Brand Anchoring', result[1].title - assert_equal 2, result[1].valid_count - assert_equal 4, result[1].total_count + assert_equal 3, result[1].valid_count + assert_equal 5, result[1].total_count assert_equal 'Subscribe Annotations', result[2].title assert_equal 2, result[2].valid_count - assert_equal 4, result[2].total_count + assert_equal 5, result[2].total_count assert_equal 'YouTube Association', result[3].title assert_equal 2, result[3].valid_count - assert_equal 4, result[3].total_count + assert_equal 5, result[3].total_count assert_equal 'Possible End Card Annotations', result[4].title assert_equal 1, result[4].valid_count - assert_equal 4, result[4].total_count + assert_equal 5, result[4].total_count assert_equal 'Playlist Description', result[5].title assert_equal 1, result[5].valid_count assert_equal 2, result[5].total_count end - - def test_ring_channel_info_cards - audit = Yt::Audit.new(channel_id: 'UCSDG3M0e2mGX9_qtHEtzj2Q') - result = audit.run - - assert_equal 'Info Cards', result[0].title - assert_equal 0, result[0].valid_count - assert_equal 10, result[0].total_count - end end
Remove Ring channel test case (change custom sample channel) It was Branding annotation subclassing Card annotation on yt-annotation gem. Add Branding Card to our sample channel.
diff --git a/metadata.rb b/metadata.rb index abc1234..def5678 100644 --- a/metadata.rb +++ b/metadata.rb @@ -4,7 +4,7 @@ license 'Apache v2.0' description 'Installs/Configures consul' long_description 'Installs/Configures consul' -version '0.4.4' +version '0.5.0' recipe 'consul', 'Installs and starts consul service.' recipe 'consul::install_binary', 'Installs consul service from binary.'
Bump version to highlight breaking changes. This is a version bump as commits for #56 caused some breaking changes. Since we haven't pushed 0.4.4 yet to supermarket (or tagged release, for that matter) let's bump this. There are a few pull-requests that we are waiting on prior to release.
diff --git a/nap.gemspec b/nap.gemspec index abc1234..def5678 100644 --- a/nap.gemspec +++ b/nap.gemspec @@ -16,7 +16,7 @@ spec.files = ['lib/rest.rb', 'lib/rest/request.rb', 'lib/rest/response.rb', 'support/cacert.pem'] spec.has_rdoc = true - spec.extra_rdoc_files = ['README', 'LICENSE'] + spec.extra_rdoc_files = ['README.md', 'LICENSE'] spec.rdoc_options << "--charset=utf-8" spec.add_development_dependency('rake')
Use README.md in the gemspec too.
diff --git a/features/support/env.rb b/features/support/env.rb index abc1234..def5678 100644 --- a/features/support/env.rb +++ b/features/support/env.rb @@ -1,6 +1,7 @@ require 'fileutils' require_relative "../../lib/cranium" +FileUtils.mkdir_p("log") unless Dir.exists?("log") Cranium.configure do |config| config.greenplum_connection_string = "postgres://cranium:cranium@192.168.56.43:5432/cranium"
Create log dir before cucumber tests
diff --git a/features/support/env.rb b/features/support/env.rb index abc1234..def5678 100644 --- a/features/support/env.rb +++ b/features/support/env.rb @@ -29,4 +29,9 @@ c.cassette_library_dir = 'fixtures/vcr_cassettes' c.hook_into :webmock end + + # Clean up any state left behind + at_exit do + # TODO clean up things created in Xero + end end
Add a place for post-test cleanup to go Tests should be idempotent when run without VCR. 0:05
diff --git a/features/support/vcr.rb b/features/support/vcr.rb index abc1234..def5678 100644 --- a/features/support/vcr.rb +++ b/features/support/vcr.rb @@ -0,0 +1,12 @@+require 'vcr' + +VCR.config do |conf| + conf.stub_with :webmock + conf.cassette_library_dir = 'features/cassettes' + conf.default_cassette_options = { :record => :new_episodes } + conf.filter_sensitive_data('<***>') { ''} +end + +VCR.cucumber_tags do |t| + t.tag '@live', :record => :all +end
Add support for feature testing of live requests.
diff --git a/postfix_admin.gemspec b/postfix_admin.gemspec index abc1234..def5678 100644 --- a/postfix_admin.gemspec +++ b/postfix_admin.gemspec @@ -5,6 +5,7 @@ gem.add_dependency 'thor' gem.add_dependency 'data_mapper' gem.add_dependency 'dm-mysql-adapter' + gem.add_development_dependency 'dm-sqlite-adapter' gem.authors = ["Hitoshi Kurokawa"] gem.email = ["hitoshi@nextseed.jp"]
Add dm-sqlite-adapter in development dependency
diff --git a/lib/active_record/validations/string_truncator.rb b/lib/active_record/validations/string_truncator.rb index abc1234..def5678 100644 --- a/lib/active_record/validations/string_truncator.rb +++ b/lib/active_record/validations/string_truncator.rb @@ -23,7 +23,7 @@ module ClassMethods def truncate_to_field_limit(field) define_method(:"#{field}=") do |value| - write_attribute(field, truncate_value_to_field_limit(field, value)) + super(truncate_value_to_field_limit(field, value)) end end
Use super instead of write_attribute
diff --git a/ohm.gemspec b/ohm.gemspec index abc1234..def5678 100644 --- a/ohm.gemspec +++ b/ohm.gemspec @@ -15,7 +15,7 @@ s.add_dependency "redic" s.add_dependency "nido" s.add_dependency "stal" - s.add_dependency "msgpack" + s.add_dependency "msgpack", "~> 0.5.0" s.add_development_dependency "cutest" end
Add explicit version range to msgpack dependency `msgpack` version 0.6.0 introduces some breaking changes, so it is now necessary to specify version range for this dependency until that issue is resolved.
diff --git a/frontend/spree_frontend.gemspec b/frontend/spree_frontend.gemspec index abc1234..def5678 100644 --- a/frontend/spree_frontend.gemspec +++ b/frontend/spree_frontend.gemspec @@ -21,7 +21,7 @@ s.add_dependency 'spree_api', version s.add_dependency 'spree_core', version - s.add_dependency 'bootstrap-sass', '~> 3.3.1' + s.add_dependency 'bootstrap-sass', '>= 3.3.5.1', '< 3.4' s.add_dependency 'canonical-rails', '~> 0.0.4' s.add_dependency 'jquery-rails', '~> 4.0.3' s.add_dependency 'sprockets-rails', '~> 2.2'
Update bootstrap-sass dependency in spree/frontend
diff --git a/test/options_test.rb b/test/options_test.rb index abc1234..def5678 100644 --- a/test/options_test.rb +++ b/test/options_test.rb @@ -20,3 +20,21 @@ assert_equal(params[:ci], false) assert_equal(params[:mrbgem_name], "mruby-buz") end + +assert("MrbgemTemplate.parse_options! default values") do + argv = [ + "-u", "dummy-user", + "-a", "Dummy authors", # todo: mock git command response? + "mruby-qaaz_qez" + ] + params = MrbgemTemplate.parse_options!(argv) + + assert_equal(params[:license], "MIT") + assert_equal(params[:github_user], "dummy-user") + assert_equal(params[:mrbgem_prefix], ".") + assert_equal(params[:class_name], "QaazQez") + assert_equal(params[:author], "Dummy authors") + assert_equal(params[:local_builder], true) + assert_equal(params[:ci], true) + assert_equal(params[:mrbgem_name], "mruby-qaaz_qez") +end
Add a test of default values
diff --git a/db/migrate/20130424180022_visualizations.rb b/db/migrate/20130424180022_visualizations.rb index abc1234..def5678 100644 --- a/db/migrate/20130424180022_visualizations.rb +++ b/db/migrate/20130424180022_visualizations.rb @@ -1,24 +1,16 @@ # encoding: utf-8 -class VisualizationsMigration < Sequel::Migration +class VisualizationsFixMigration < Sequel::Migration def up - drop_table :visualizations - create_table :visualizations do - String :id, null: false, primary_key: true - String :name, text: true - String :description, text: true - Integer :map_id, index: true - String :type - Array :tags - end - - Rails::Sequel.connection.run(%q{ - ALTER TABLE "visualizations" - ADD COLUMN tags text[] + Rails::Sequel.connection.run(%Q{ + ALTER TABLE visualizations + ALTER COLUMN map_id + TYPE integer + USING map_id::integer }) end #up def down end #down -end # VisualizationsMigration +end # VisualizationsFixMigration
Fix visualizations table by casting the type of the map_id column
diff --git a/db/migration/20130108000009_create_users.rb b/db/migration/20130108000009_create_users.rb index abc1234..def5678 100644 --- a/db/migration/20130108000009_create_users.rb +++ b/db/migration/20130108000009_create_users.rb @@ -2,15 +2,19 @@ class CreateUsers < ActiveRecord::Migration[4.2] def change - return if table_exists? :users + if table_exists? :users + change_table :users do |t| + t.string :password_digest, limit: 60 + end + else + create_table :users do |t| + t.string :name, limit: 40, unique: true + t.string :email, limit: 40, unique: true + t.string :password_digest, limit: 60 + t.integer :permission_level, default: 1 - create_table :users do |t| - t.string :name, limit: 40, unique: true - t.string :email, limit: 40, unique: true - t.string :password_digest, limit: 60 - t.integer :permission_level, default: 1 - - t.timestamps + t.timestamps + end end end end
Add password_digest column if users table already exists
diff --git a/grape_devise_token_auth.gemspec b/grape_devise_token_auth.gemspec index abc1234..def5678 100644 --- a/grape_devise_token_auth.gemspec +++ b/grape_devise_token_auth.gemspec @@ -19,6 +19,6 @@ spec.add_development_dependency "bundler", "~> 1.8" spec.add_development_dependency "rake", "~> 10.0" spec.add_dependency 'grape', '> 0.9.0' - spec.add_dependency 'devise', '~> 3.3' + spec.add_dependency 'devise', '~> 4.1' spec.add_dependency 'devise_token_auth', '~> 0.1.32.beta9' end
Update to use latest devise version
diff --git a/lib/yodleeicious.rb b/lib/yodleeicious.rb index abc1234..def5678 100644 --- a/lib/yodleeicious.rb +++ b/lib/yodleeicious.rb @@ -12,7 +12,8 @@ class Faraday::Adapter::NetHttp def net_http_connection(env) - if !(proxy = env[:request][:proxy]).empty? + proxy = env[:request][:proxy] + if proxy && !proxy.empty? if proxy[:socks] # TCPSocket.socks_username = proxy[:user] if proxy[:user] # TCPSocket.socks_password = proxy[:password] if proxy[:password] @@ -24,4 +25,4 @@ Net::HTTP end.new(env[:url].host, env[:url].port) end -end+end
Fix calling `.empty?` on `nil` (Faraday Monkey Patch) If `env[:request][:proxy]` was `nil` an error would be raised as `nil` does not have `.empty?`. This caused problems with code that used Faraday (such as librato-rack).
diff --git a/app/controller.rb b/app/controller.rb index abc1234..def5678 100644 --- a/app/controller.rb +++ b/app/controller.rb @@ -11,5 +11,10 @@ post '/' do puts params.inspect - #HTTParty.post("http://www.flysfo.com/sites/all/themes/sfo/php/sendmail.php", params) + if ENV['LIVE_FIRE'] == 'true' + puts "sending emails is ENABLED" + HTTParty.post("http://www.flysfo.com/sites/all/themes/sfo/php/sendmail.php", params) + else + puts "sending emails is DISABLED" + end end
Add config switch to enable/disable email sending
diff --git a/spec/lib/special_route_publisher_spec.rb b/spec/lib/special_route_publisher_spec.rb index abc1234..def5678 100644 --- a/spec/lib/special_route_publisher_spec.rb +++ b/spec/lib/special_route_publisher_spec.rb @@ -3,40 +3,50 @@ RSpec.describe SpecialRoutePublisher do describe "publish" do - it "calls 'publish' on the passed 'publisher' argument" do - publisher = double("GdsApi::PublishingApi::SpecialRoutePublisher") - expect(publisher).to receive(:publish).with(hash_including({ - publishing_app: "collections-publisher", - rendering_app: "collections", - type: "route_type", - public_updated_at: Time.zone.now.iso8601, - update_type: "major", - foo: "bar", - })) + it "calls 'publish' on SpecialRoutePublisher with a route" do + route = { + document_type: "answer", + content_id: SecureRandom.uuid, + base_path: "/foo", + locale: "en", + title: "Title", + description: "description", + } - SpecialRoutePublisher.new({}, publisher) - .publish("route_type", { foo: "bar" }) + expect_any_instance_of(GdsApi::PublishingApi::SpecialRoutePublisher) + .to receive(:publish) + .with( + { + publishing_app: "collections-publisher", + rendering_app: "collections", + type: "exact", + update_type: "major", + }.merge(route), + ).at_least(:once) + + SpecialRoutePublisher.new + .publish(route) end end describe "unpublish" do it "calls Publishing API's unpublish method directly" do - publishing_api = double("Publishing API") content_id = SecureRandom.uuid - options = { foo: "bar" } - expect(publishing_api).to receive(:unpublish).with( + options = { type: "exact" } + + expect(Services.publishing_api).to receive(:unpublish).with( content_id, options, ) - SpecialRoutePublisher.new({ publishing_api: publishing_api }) + SpecialRoutePublisher.new .unpublish(content_id, options) end end describe "routes" do - it "should return a hash" do - expect(SpecialRoutePublisher.routes).to include(:exact) + it "should return an array of routes" do + expect(SpecialRoutePublisher.routes.first).to include(:content_id) end end end
Update specs following simplification of SpecialRoutePublisher
diff --git a/spec/requests/users/active_admin_spec.rb b/spec/requests/users/active_admin_spec.rb index abc1234..def5678 100644 --- a/spec/requests/users/active_admin_spec.rb +++ b/spec/requests/users/active_admin_spec.rb @@ -0,0 +1,35 @@+require 'spec_helper' + +describe 'Active Admin' do + + it "authorizes a superadmin" do + @user = create(:superadmin) + sign_in @user + visit "/admin" + expect(page).to have_content "Dashboard" + end + + it "does not authorize a reqular user" do + @user = create(:user) + sign_in @user + visit "/admin" + expect(page).not_to have_content "Dashboard" + expect(page).to have_content "Unauthorized Access!" + end + + it "does not authorize a regular administrator" do + @user = create(:admin) + sign_in @user + visit "/admin" + expect(page).not_to have_content "Dashboard" + expect(page).to have_content "Unauthorized Access!" + end + + it "does not authorize a guest who is not signed in" do + sign_out + visit "/admin" + expect(page).not_to have_content "Dashboard" + expect(page).to have_content "You need to sign in" + end + +end
Add authorization spec for active_admin. - Only superadmins are allowed to use the backend (/admin). - Users, Admins and Guests are not authorized.
diff --git a/attributes/chef.rb b/attributes/chef.rb index abc1234..def5678 100644 --- a/attributes/chef.rb +++ b/attributes/chef.rb @@ -8,3 +8,4 @@ default[:sys][:chef][:server_url] = nil default[:sys][:chef][:use_syslog] = false default[:sys][:chef][:log_level] = ':info' +default[:sys][:chef][:overwrite_warning] = "DO NOT CHANGE THIS FILE MANUALLY! This file is managed by the Chef `sys` cookbook."
Add a tempate for the "don't edit" warning
diff --git a/loc_scraper.gemspec b/loc_scraper.gemspec index abc1234..def5678 100644 --- a/loc_scraper.gemspec +++ b/loc_scraper.gemspec @@ -8,16 +8,18 @@ gem.email = ['stuff@milkfarmproductions.com'] gem.description = %q{Scrape the loc record associated with a given ISBN} gem.summary = %q{Given an ISBN, scrape the Loc record and convert into an accessible object} + gem.licenses = ['MIT'] gem.homepage = 'http://github.com/milkfarm/loc_scraper' gem.files = `git ls-files`.split($\) gem.executables = gem.files.grep(%r{^bin/}) { |f| File.basename(f) } gem.test_files = gem.files.grep(%r{^(test|spec|features)/}) gem.require_paths = ['lib'] - gem.add_dependency('mechanize', '~> 2.7.0') + gem.add_dependency 'mechanize', '~> 2.7.0', '>= 2.7.0' + gem.add_dependency 'mime-types', '~> 1.25' gem.add_development_dependency 'bundler', '~> 1.3' - gem.add_development_dependency 'rake' - gem.add_development_dependency 'rspec' + gem.add_development_dependency 'rake', '~> 10.4' + gem.add_development_dependency 'rspec', '~> 3.0' end
Adjust dependencies to address installation errors on Travis CI
diff --git a/json_yaml_assets.gemspec b/json_yaml_assets.gemspec index abc1234..def5678 100644 --- a/json_yaml_assets.gemspec +++ b/json_yaml_assets.gemspec @@ -17,5 +17,5 @@ s.files = Dir["lib/**/*"] + ["MIT-LICENSE", "README.md"] - s.add_dependency "rails", "~> 3.2" + s.add_dependency "rails", ">= 3.2" end
Allow rails >= 3.2 (including 4+)
diff --git a/etc/reversal_stub.rb b/etc/reversal_stub.rb index abc1234..def5678 100644 --- a/etc/reversal_stub.rb +++ b/etc/reversal_stub.rb @@ -0,0 +1,34 @@+class ApplicationController + def self.before_filter(*args) + end +end + +class ActionView + module Helpers + module JavaScriptHelper + end + end +end + +module ActiveRecord + class Base + def self.belongs_to(other) + end + def self.validates(*args) + end + end +end + +if ENV['UNRUBBY_STUBS'] + class Stub + def self.method_missing(sym, *args) + return Stub.new + end + end + + class Object + def self.const_missing(const) + Stub + end + end +end
Add a stub that will let you mostly boot a rails app
diff --git a/jquery-datatables-rails.gemspec b/jquery-datatables-rails.gemspec index abc1234..def5678 100644 --- a/jquery-datatables-rails.gemspec +++ b/jquery-datatables-rails.gemspec @@ -10,6 +10,7 @@ s.homepage = "https://github.com/rweng/jquery-datatables-rails" s.summary = %q{jquery datatables for rails} s.description = %q{} + s.license = 'MIT' s.files = `git ls-files`.split("\n") s.files = Dir["{app,lib,vendor}/**/*"]
Add license flag to the gemspec
diff --git a/rubyfromexcel.gemspec b/rubyfromexcel.gemspec index abc1234..def5678 100644 --- a/rubyfromexcel.gemspec +++ b/rubyfromexcel.gemspec @@ -4,7 +4,7 @@ s.add_dependency('rubyscriptwriter','>= 0.0.1') s.add_dependency('rubypeg','>= 0.0.2') s.required_ruby_version = "~>1.9.1" - s.version = '0.0.20' + s.version = '0.0.21' s.author = "Thomas Counsell, Green on Black Ltd" s.email = "ruby-from-excel@greenonblack.com" s.homepage = "http://github.com/tamc/rubyfromexcel"
Update for releasing v21 of the gem
diff --git a/examples/workflow.rb b/examples/workflow.rb index abc1234..def5678 100644 --- a/examples/workflow.rb +++ b/examples/workflow.rb @@ -1,7 +1,7 @@ # An example post-processing workflow using polisher require 'polisher/git' -require 'polisher/rpmspec' +require 'polisher/rpm/spec' require 'polisher/gem' git = Polisher::GitPackage.clone('rails')
Fix require path in example
diff --git a/spec/workers/save_to_cloud_storage_worker_spec.rb b/spec/workers/save_to_cloud_storage_worker_spec.rb index abc1234..def5678 100644 --- a/spec/workers/save_to_cloud_storage_worker_spec.rb +++ b/spec/workers/save_to_cloud_storage_worker_spec.rb @@ -1,4 +1,5 @@ require 'rails_helper' + RSpec.describe SaveToCloudStorageWorker, type: :worker do let(:worker) { described_class.new }
Add blank line between require statement and spec definition To improve readability.
diff --git a/lib/ab_panel/mixpanel.rb b/lib/ab_panel/mixpanel.rb index abc1234..def5678 100644 --- a/lib/ab_panel/mixpanel.rb +++ b/lib/ab_panel/mixpanel.rb @@ -15,7 +15,19 @@ end def track(event_name, properties, options={}) - @tracker.track event_name, properties, options + if defined?(Resque) + Resque.enqueue ResqueTracker, event_name, properties, options + else + @tracker.track event_name, properties, options + end + end + end + + class ResqueTracker + @queue = :ab_panel + + def self.perform(event_name, properties, options={}) + Tracker.new.track(event_name, properties, options) end end
Use Resque for background jobs if present.
diff --git a/lib/graphql/language/nodes/deep_freeze_ext.rb b/lib/graphql/language/nodes/deep_freeze_ext.rb index abc1234..def5678 100644 --- a/lib/graphql/language/nodes/deep_freeze_ext.rb +++ b/lib/graphql/language/nodes/deep_freeze_ext.rb @@ -10,16 +10,10 @@ # # Returns self Node. def deep_freeze - self.class.child_attributes.each do |attr_name| - public_send(attr_name).freeze.each(&:deep_freeze) - end - - self.class.scalar_attributes.each do |attr_name| - object = public_send(attr_name) - object.freeze if object - end - + children.each(&:deep_freeze) + scalars.each { |s| s && s.freeze } freeze + self end end end
Refactor deep-freeze for 1.8-dev support
diff --git a/rakefile.rb b/rakefile.rb index abc1234..def5678 100644 --- a/rakefile.rb +++ b/rakefile.rb @@ -17,6 +17,17 @@ cd 'app' do sh "BUCKET=#{DOMAIN} rake deploy" end + + name_servers = `terraform output name_servers` + .split(/[,\s]+/) + .map { |s| 'Name=' + s } + .join ' ' + + sh %W[ + aws route53domains update-domain-nameservers + --domain #{DOMAIN} + --nameservers #{name_servers} + ].join ' ' end task :withdraw do
Update name servers on deployment
diff --git a/bricolage.gemspec b/bricolage.gemspec index abc1234..def5678 100644 --- a/bricolage.gemspec +++ b/bricolage.gemspec @@ -16,12 +16,12 @@ s.executables = s.files.grep(%r{bin/}).map {|path| File.basename(path) } s.require_path = 'lib' - s.required_ruby_version = '>= 2.0.0' - s.add_dependency 'pg', '~> 0.18.0' - s.add_dependency 'aws-sdk-s3', '~> 1' - s.add_dependency 'aws-sdk-sns', '~> 1' - s.add_development_dependency 'test-unit' - s.add_development_dependency 'rake' - s.add_development_dependency 'mocha' - s.add_development_dependency 'pry-byebug' + s.required_ruby_version = '>= 2.4.0' + s.add_dependency 'pg', '~> 1.2.3' + s.add_dependency 'aws-sdk-s3', '~> 1.64' + s.add_dependency 'aws-sdk-sns', '~> 1.23' + s.add_development_dependency 'test-unit', '~> 3.3' + s.add_development_dependency 'rake', '~> 13.0' + s.add_development_dependency 'mocha', '~> 1.11' + s.add_development_dependency 'pry-byebug', '~> 3.9' end
Upgrade pg from 0.18 to 1.2.3. Note: pg 1.x does not support Redshift (PostgreSQL 8)
diff --git a/lib/api-client/configuration.rb b/lib/api-client/configuration.rb index abc1234..def5678 100644 --- a/lib/api-client/configuration.rb +++ b/lib/api-client/configuration.rb @@ -18,7 +18,7 @@ # # @param [String] path api url. def path=(path) - path = "#{path}/" unless path[-1] == '/' + path = "#{path}/" unless path[path.size - 1, 1] == '/' @paths = { :default => path } end @@ -28,7 +28,7 @@ def paths=(paths = {}) @paths = {} paths.each do |name, path| - if path[-1] == '/' + if path[path.size - 1, 1] == '/' @paths[name] = path else @paths[name] = "#{path}/"
Fix for ruby 1.8.7 and ree
diff --git a/lib/chatrix/bot/plugins/echo.rb b/lib/chatrix/bot/plugins/echo.rb index abc1234..def5678 100644 --- a/lib/chatrix/bot/plugins/echo.rb +++ b/lib/chatrix/bot/plugins/echo.rb @@ -7,6 +7,8 @@ # Provides a command to make the bot echo what was passed in as # argument to the command. class Echo < Plugin + command_restriction 50 + register_command 'echo', '<text>', 'Makes the bot echo the specified text to chat', aliases: ['say'], handler: :say
Add a power level restriction on Echo
diff --git a/lib/dry/types/coercions/json.rb b/lib/dry/types/coercions/json.rb index abc1234..def5678 100644 --- a/lib/dry/types/coercions/json.rb +++ b/lib/dry/types/coercions/json.rb @@ -8,7 +8,7 @@ module Coercions module JSON def self.to_nil(input) - input unless input.is_a?(String) && input == '' + input unless ''.eql?(input) end def self.to_date(input)
Refactor `JSON.to_nil` to use `eql?` The check input.is_a?(String) && input == '' is equivalent to ''.eql?(input) since `eql?` does not permit coercion
diff --git a/lib/masamune/tasks/hive_thor.rb b/lib/masamune/tasks/hive_thor.rb index abc1234..def5678 100644 --- a/lib/masamune/tasks/hive_thor.rb +++ b/lib/masamune/tasks/hive_thor.rb @@ -17,6 +17,7 @@ method_option :output, :aliases => '-o', :desc => 'Save SQL output to file' method_option :delimiter, :desc => 'Hive row format delimiter', :default => "\001" method_option :csv, :type => :boolean, :desc => 'Report SQL output in CSV format', :default => false + method_option :variables, :aliases => '-D', :type => :hash, :desc => 'Variables to substitute in SQL', :default => {} def hive_exec hive_options = options.dup hive_options.merge!(print: true)
Allow variables to be passed through via CLI
diff --git a/lib/rubocop/cop/rails/output.rb b/lib/rubocop/cop/rails/output.rb index abc1234..def5678 100644 --- a/lib/rubocop/cop/rails/output.rb +++ b/lib/rubocop/cop/rails/output.rb @@ -13,7 +13,8 @@ :print, :p, :pp, - :pretty_print].freeze + :pretty_print, + :ap].freeze def on_send(node) receiver, method_name, *args = *node
Include ap (awesome_print) in list of print methods
diff --git a/rakuten_web_service.gemspec b/rakuten_web_service.gemspec index abc1234..def5678 100644 --- a/rakuten_web_service.gemspec +++ b/rakuten_web_service.gemspec @@ -1,4 +1,3 @@-# coding: utf-8 lib = File.expand_path('../lib', __FILE__) $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) require 'rakuten_web_service/version' @@ -14,7 +13,6 @@ spec.license = "MIT" spec.files = `git ls-files`.split($/) - spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) } spec.test_files = spec.files.grep(%r{^(test|spec|features)/}) spec.require_paths = ["lib"] spec.required_ruby_version = '>= 2.1.0'
Remove `executables` since this gem doesn't provide any command [ci skip]
diff --git a/react-native-branch.podspec b/react-native-branch.podspec index abc1234..def5678 100644 --- a/react-native-branch.podspec +++ b/react-native-branch.podspec @@ -23,7 +23,7 @@ s.compiler_flags = %[-DRNBRANCH_VERSION=@\\"#{s.version}\\"] s.header_dir = 'RNBranch' # also sets generated module name s.dependency 'Branch', '1.40.2' - s.dependency 'React' # to ensure the correct build order + s.dependency 'React-Core' # to ensure the correct build order # Swift/Objective-C compatibility s.pod_target_xcconfig = {
Use React-Core instead of React We should depend on React-Core instead of React according to facebook/react-native#29633 (comment). You can check all the related PRs links to this issue.
diff --git a/lib/jpmobile/resolver.rb b/lib/jpmobile/resolver.rb index abc1234..def5678 100644 --- a/lib/jpmobile/resolver.rb +++ b/lib/jpmobile/resolver.rb @@ -8,5 +8,26 @@ super(path, pattern || DEFAULT_PATTERN) @path = File.expand_path(path) end + + private + + def query(path, details, formats) + query = build_query(path, details) + templates = [] + sanitizer = Hash.new { |h,k| h[k] = Dir["#{File.dirname(k)}/*"] } + + Dir[query].each do |p| + next if File.directory?(p) || !sanitizer[p].include?(p) + + handler, format = extract_handler_and_format(p, formats) + contents = File.open(p, "rb") { |io| io.read } + variant = p.match(/.+#{path}(.+)\.#{format.to_sym.to_s}.*$/) ? $1 : '' + + templates << ActionView::Template.new(contents, File.expand_path(p), handler, + :virtual_path => path.name + variant, :format => format, :updated_at => mtime(p)) + end + + templates + end end end
Modify virtual_path in ActionView::Template for TESTING
diff --git a/lib/fabrication/fabricator.rb b/lib/fabrication/fabricator.rb index abc1234..def5678 100644 --- a/lib/fabrication/fabricator.rb +++ b/lib/fabrication/fabricator.rb @@ -1,48 +1,44 @@ class Fabrication::Fabricator - class << self + def self.define(name, options={}, &block) + raise Fabrication::DuplicateFabricatorError, "'#{name}' is already defined" if schematics.include?(name) + aliases = Array(options.delete(:aliases)) + schematic = schematics[name] = schematic_for(name, options, &block) + Array(aliases).each do |as| + schematics[as.to_sym] = schematic + end + schematic + end - def define(name, options={}, &block) - raise Fabrication::DuplicateFabricatorError, "'#{name}' is already defined" if schematics.include?(name) - aliases = Array(options.delete(:aliases)) - schematic = schematics[name] = schematic_for(name, options, &block) - Array(aliases).each do |as| - schematics[as.to_sym] = schematic - end - schematic + def self.generate(name, options={}, overrides={}, &block) + Fabrication::Support.find_definitions if schematics.empty? + raise Fabrication::UnknownFabricatorError, "No Fabricator defined for '#{name}'" unless schematics.has_key?(name) + schematics[name].generate(options, overrides, &block) + end + + def self.schematics + @schematics ||= {} + end + + private + + def self.class_name_for(name, parent, options) + options[:class_name] || + (parent && parent.klass.name) || + options[:from] || + name + end + + def self.schematic_for(name, options, &block) + parent = schematics[options[:from]] + class_name = class_name_for(name, parent, options) + klass = Fabrication::Support.class_for(class_name) + raise Fabrication::UnfabricatableError, "No class found for '#{name}'" unless klass + if parent + parent.merge(&block).tap { |s| s.klass = klass } + else + Fabrication::Schematic.new(klass, &block) end - - def generate(name, options={}, overrides={}, &block) - Fabrication::Support.find_definitions if schematics.empty? - raise Fabrication::UnknownFabricatorError, "No Fabricator defined for '#{name}'" unless schematics.has_key?(name) - schematics[name].generate(options, overrides, &block) - end - - def schematics - @schematics ||= {} - end - - private - - def class_name_for(name, parent, options) - options[:class_name] || - (parent && parent.klass.name) || - options[:from] || - name - end - - def schematic_for(name, options, &block) - parent = schematics[options[:from]] - class_name = class_name_for(name, parent, options) - klass = Fabrication::Support.class_for(class_name) - raise Fabrication::UnfabricatableError, "No class found for '#{name}'" unless klass - if parent - parent.merge(&block).tap { |s| s.klass = klass } - else - Fabrication::Schematic.new(klass, &block) - end - end - end end
Change how class methods are specified in Fabricator
diff --git a/chefstyle.gemspec b/chefstyle.gemspec index abc1234..def5678 100644 --- a/chefstyle.gemspec +++ b/chefstyle.gemspec @@ -9,12 +9,12 @@ spec.authors = ["Chef Software, Inc."] spec.email = ["oss@chef.io"] - spec.summary = %q{Rubocop configuration for Chef's ruby projects} + spec.summary = %q{RuboCop configuration for Chef's ruby projects} spec.homepage = "https://github.com/chef/chefstyle" spec.license = "Apache-2.0" spec.required_ruby_version = ">= 2.4" - spec.files = %w{LICENSE chefstyle.gemspec Gemfile} + Dir.glob("{bin,config,lib}/**/*", File::FNM_DOTMATCH).reject { |f| File.directory?(f) } + spec.files = %w{LICENSE} + Dir.glob("{bin,config,lib}/**/*", File::FNM_DOTMATCH).reject { |f| File.directory?(f) } spec.executables = %w{chefstyle} spec.require_paths = ["lib"]
Stop shipping the Gemfile and Gemspec in the gem We never appbundler this app so we don't need either of these. Signed-off-by: Tim Smith <764ef62106582a09ed09dfa0b6bff7c05fd7d1e4@chef.io>
diff --git a/lib/noosfero/plugin/routes.rb b/lib/noosfero/plugin/routes.rb index abc1234..def5678 100644 --- a/lib/noosfero/plugin/routes.rb +++ b/lib/noosfero/plugin/routes.rb @@ -3,5 +3,6 @@ map.connect 'plugin/' + plugin_name + '/:action/:id', :controller => plugin_name + '_plugin_environment' map.connect 'profile/:profile/plugins/' + plugin_name + '/:action/:id', :controller => plugin_name + '_plugin_profile' map.connect 'myprofile/:profile/plugin/' + plugin_name + '/:action/:id', :controller => plugin_name + '_plugin_myprofile' + map.connect 'admin/plugin/' + plugin_name + '/:action/:id', :controller => plugin_name + '_plugin_admin' end
Add route for plugin administration
diff --git a/lib/simple_templates/lexer.rb b/lib/simple_templates/lexer.rb index abc1234..def5678 100644 --- a/lib/simple_templates/lexer.rb +++ b/lib/simple_templates/lexer.rb @@ -16,8 +16,7 @@ end def tokenize - tokens = [] - text, start_text_pos = '', 0 + tokens = [] until @ss.eos? tok = next_token @@ -29,7 +28,7 @@ end end - text.empty? ? tokens : tokens << Token.new(:text, text, start_text_pos) + tokens end private
Remove unnecessary code in Lexer pointed out by Stepan
diff --git a/twitter-text.gemspec b/twitter-text.gemspec index abc1234..def5678 100644 --- a/twitter-text.gemspec +++ b/twitter-text.gemspec @@ -1,10 +1,10 @@ spec = Gem::Specification.new do |s| s.name = "twitter-text" - s.version = "1.4.9" + s.version = "1.4.10" s.authors = ["Matt Sanford", "Patrick Ewing", "Ben Cherry", "Britt Selvitelle", - "Raffi Krikorian", "J.P. Cummins", "Yoshimasa Niwa"] + "Raffi Krikorian", "J.P. Cummins", "Yoshimasa Niwa", "Keita Fujii"] s.email = ["matt@twitter.com", "patrick.henry.ewing@gmail.com", "bcherry@gmail.com", "bs@brittspace.com", - "raffi@twitter.com", "jcummins@twitter.com", "niw@niw.at"] + "raffi@twitter.com", "jcummins@twitter.com", "niw@niw.at", "keita@twitter.com"] s.homepage = "http://twitter.com" s.description = s.summary = "A gem that provides text handling for Twitter"
Change the version number to 1.4.10.
diff --git a/mysql-tools.gemspec b/mysql-tools.gemspec index abc1234..def5678 100644 --- a/mysql-tools.gemspec +++ b/mysql-tools.gemspec @@ -11,7 +11,7 @@ s.description = "Backup, Restore and Obfuscate database dumps." s.required_rubygems_version = ">= 1.3.6" - s.add_dependency "gli", "2.4.1" + s.add_dependency "gli", "2.5.4" s.add_dependency "mysql2" s.add_dependency "my_obfuscate" s.add_dependency "erubis"
Update gli dependency to version 2.5.4.
diff --git a/lib/zuora/http_client.rb b/lib/zuora/http_client.rb index abc1234..def5678 100644 --- a/lib/zuora/http_client.rb +++ b/lib/zuora/http_client.rb @@ -5,5 +5,6 @@ format :json headers "Accept" => "application/json" headers "Content-Type" => "application/json" + headers "User-Agent" => "zuora-rest/#{Zuora::VERSION}" end end
Add a user agent to API requests
diff --git a/lib/ankirb/anki/deck.rb b/lib/ankirb/anki/deck.rb index abc1234..def5678 100644 --- a/lib/ankirb/anki/deck.rb +++ b/lib/ankirb/anki/deck.rb @@ -28,18 +28,19 @@ attr_accessor :front, :back, :tags, :deck attr_reader :id - @@defaults = { - :front => 'Card Front', - :back => 'Card Back' - } def initialize options={} - @front = options[:front] || @@defaults[:front] - @back = options[:back] || @@defaults[:back] + @front = options[:front] || '' + @back = options[:back] || '' @tags = options[:tags] || [] @id = Time.now.to_i end + + alias :question :front + alias :question= :front= + alias :answer :back + alias :answer= :back= end class Type
Add front / back aliases.
diff --git a/Casks/polar-websync.rb b/Casks/polar-websync.rb index abc1234..def5678 100644 --- a/Casks/polar-websync.rb +++ b/Casks/polar-websync.rb @@ -2,6 +2,7 @@ version '2.8.2' sha256 '287230ee323cca9887f31e448cbac759c770448e25c31c164b87f69bb3ead9b9' + # polarpersonaltrainer.com was verified as official when first introduced to the cask url "https://www.polarpersonaltrainer.com/downloads/websync_#{version}.dmg" name 'Polar WebSync Software' homepage 'https://www.polar.com/us-en/support/downloads/Polar_WebSync_Software'
Fix `url` stanza comment for Polar WebSync Software.
diff --git a/jekyll-cloudinary.gemspec b/jekyll-cloudinary.gemspec index abc1234..def5678 100644 --- a/jekyll-cloudinary.gemspec +++ b/jekyll-cloudinary.gemspec @@ -24,5 +24,5 @@ spec.add_development_dependency "bundler", "~> 1.16" spec.add_development_dependency "rake", "~> 12.0" - spec.add_development_dependency "rubocop", "~> 0.74.0" + spec.add_development_dependency "rubocop", "~> 1.37.1" end
Update rubocop requirement from ~> 0.74.0 to ~> 1.37.1 Updates the requirements on [rubocop](https://github.com/rubocop/rubocop) to permit the latest version. - [Release notes](https://github.com/rubocop/rubocop/releases) - [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop/compare/v0.74.0...v1.37.1) --- updated-dependencies: - dependency-name: rubocop dependency-type: direct:development ... Signed-off-by: dependabot[bot] <5bdcd3c0d4d24ae3e71b3b452a024c6324c7e4bb@github.com>