diff stringlengths 65 26.7k | message stringlengths 7 9.92k |
|---|---|
diff --git a/populate-me.gemspec b/populate-me.gemspec
index abc1234..def5678 100644
--- a/populate-me.gemspec
+++ b/populate-me.gemspec
@@ -1,20 +1,21 @@-require_relative './lib/populate_me/version'
+require_relative 'lib/populate_me/version'
Gem::Specification.new do |s|
- s.name = 'populate-me'
- s.version = PopulateMe::VERSION
- s.platform = Gem::Platform::RUBY
- s.summary = "ALPHA !!! Populate Me is a relatively complete but simple CMS"
- s.description = "ALPHA !!! Populate Me is a relatively complete but simple CMS. It includes a Rack middleware for putting in your Rack stack, and a bespoke MongoDB ODM. But Populate Me is not really finished yet."
- s.author = "Mickael Riga"
- s.email = "mig@mypeplum.com"
+ s.authors = ["Mickael Riga"]
+ s.email = ["mig@mypeplum.com"]
s.homepage = "https://github.com/mig-hub/populate-me"
s.licenses = ['MIT']
+ s.name = 'populate-me'
+ s.version = PopulateMe::VERSION
+ s.summary = "ALPHA !!! PopulateMe is an admin system for web applications."
+ s.description = "ALPHA !!! PopulateMe is an admin system for web applications. It is built on top of the Sinatra framework, but can be used with any framework using Rack."
+
+ s.platform = Gem::Platform::RUBY
s.files = `git ls-files`.split("\n").sort
- s.test_files = s.files.select { |p| p =~ /^spec\/.*_spec.rb/ }
- s.require_path = './lib'
+ s.test_files = s.files.grep(/^spec\//)
+ s.require_paths = ['lib']
s.add_dependency('sinatra')
s.add_dependency('json')
| Update the gemspec a bit
|
diff --git a/roles/cassandra_datanode.rb b/roles/cassandra_datanode.rb
index abc1234..def5678 100644
--- a/roles/cassandra_datanode.rb
+++ b/roles/cassandra_datanode.rb
@@ -11,7 +11,6 @@ cassandra::autoconf
cassandra::server
cassandra::jna_support
- cassandra::iptables
]
# Attributes applied if the node doesn't have it set already.
| Revert iptables addition for now...not working.
|
diff --git a/lib/vagrant/cli.rb b/lib/vagrant/cli.rb
index abc1234..def5678 100644
--- a/lib/vagrant/cli.rb
+++ b/lib/vagrant/cli.rb
@@ -1,3 +1,5 @@+require 'optparse'
+
module Vagrant
# Manages the command line interface to Vagrant.
class CLI < Command::Base
@@ -15,7 +17,26 @@ :prefix => false)
return
+ elsif @main_args.include?("-h") || @main_args.include?("--help")
+ # Help is next in short-circuiting everything. Print
+ # the help and exit.
+ return help
end
+ end
+
+ # This prints the help for the CLI out.
+ def help
+ # We use the optionparser for this. Its just easier. We don't use
+ # an optionparser above because I don't think the performance hits
+ # of creating a whole object are worth checking only a couple flags.
+ opts = OptionParser.new do |opts|
+ opts.banner = "Usage: vagrant [-v] [-h] command [<args>]"
+ opts.separator ""
+ opts.on("-v", "--version", "Print the version and exit.")
+ opts.on("-h", "--help", "Print this help.")
+ end
+
+ @env.ui.info(opts.help, :prefix => false)
end
end
end
| Print help and exit on "-h"
|
diff --git a/config/initializers/browse_everything.rb b/config/initializers/browse_everything.rb
index abc1234..def5678 100644
--- a/config/initializers/browse_everything.rb
+++ b/config/initializers/browse_everything.rb
@@ -5,7 +5,7 @@ }
elsif Settings.dropbox.path =~ %r{^s3://}
obj = FileLocator::S3File.new(Settings.dropbox.path).object
- { 's3' => { name: 'AWS S3 Dropbox', bucket: obj.bucket_name, base: obj.key, response_type: :s3_uri } }
+ { 's3' => { name: 'AWS S3 Dropbox', bucket: obj.bucket_name, base: obj.key, response_type: :s3_uri, region: obj.client.config.region } }
else
{ 'file_system' => { name: 'File Dropbox', home: Settings.dropbox.path } }
end
| Add config key required for newer browse-everything
|
diff --git a/lib/simple_pusher.rb b/lib/simple_pusher.rb
index abc1234..def5678 100644
--- a/lib/simple_pusher.rb
+++ b/lib/simple_pusher.rb
@@ -3,6 +3,12 @@ require 'simple_pusher/engine' if defined?(Rails)
module SimplePusher
+ autoload :Configuration, 'simple_pusher/configuration'
+ autoload :Connection, 'simple_pusher/connection'
+ autoload :Server, 'simple_pusher/server'
+ autoload :Middleware, 'simple_pusher/middleware'
+
+
class << self
def setup
yield configuration
@@ -34,8 +40,3 @@ module_function :publish
module_function :on
end
-
-SimplePusher.autoload :Configuration, 'simple_pusher/configuration'
-SimplePusher.autoload :Connection, 'simple_pusher/connection'
-SimplePusher.autoload :Server, 'simple_pusher/server'
-SimplePusher.autoload :Middleware, 'simple_pusher/middleware'
| Move autoload into SimplePusher module inside. |
diff --git a/providers/common.rb b/providers/common.rb
index abc1234..def5678 100644
--- a/providers/common.rb
+++ b/providers/common.rb
@@ -8,6 +8,12 @@ action :create
gid new_resource.group
end
+ end
+
+ directory new_resource.path do
+ action :create
+ owner new_resource.owner
+ group new_resource.group
end
# Update the code.
| Set up directory for checkout with proper perms
|
diff --git a/lib/active_admin/ajax_filter.rb b/lib/active_admin/ajax_filter.rb
index abc1234..def5678 100644
--- a/lib/active_admin/ajax_filter.rb
+++ b/lib/active_admin/ajax_filter.rb
@@ -15,8 +15,10 @@ dsl.instance_eval do
collection_action :filter, method: :get do
scope = collection.ransack(params[:q]).result
+ scope = scope.order(params[:order]).limit(params[:limit] || 10)
+ scope = apply_collection_decorator(scope)
- render text: scope.order(params[:order]).limit(params[:limit] || 10).to_json
+ render text: scope.to_json
end
end
end
| Apply decorator before calling to_json
|
diff --git a/lib/active_force/association.rb b/lib/active_force/association.rb
index abc1234..def5678 100644
--- a/lib/active_force/association.rb
+++ b/lib/active_force/association.rb
@@ -29,7 +29,7 @@
def belongs_to relation_name, options = {}
model = options[:model] || relation_model(relation_name)
- foreing_key = options[:foreing_key] || relation_name
+ foreing_key = options[:foreing_key] || "#{ relation_name }_id".to_sym
define_method "#{ relation_name }" do
model.find(self.send foreing_key)
end
| Add foreing key option in belongs_to |
diff --git a/lib/opal/parser/with_c_lexer.rb b/lib/opal/parser/with_c_lexer.rb
index abc1234..def5678 100644
--- a/lib/opal/parser/with_c_lexer.rb
+++ b/lib/opal/parser/with_c_lexer.rb
@@ -1,9 +1,10 @@ # frozen_string_literal: true
+# There's no compatible c_lexer for parser 3.0.0.0 at this point...
begin
require 'c_lexer'
rescue LoadError
- $stderr.puts 'Failed to load WithCLexer, using pure Ruby lexer'
+ $stderr.puts 'Failed to load WithCLexer, using pure Ruby lexer' if $DEBUG
end
if defined? Parser::Ruby25WithWithCLexer
| Hide the "Failed to load WithCLexer, using pure Ruby lexer" warning.
The rationale behind this is that we don't have a matching c_lexer for
parser 3.0.0.0 and this warning can be misleading. It isn't code removal,
as we may want to reenable this warning once c_lexer becomes compatible.
|
diff --git a/features/step_definitions/setup_steps.rb b/features/step_definitions/setup_steps.rb
index abc1234..def5678 100644
--- a/features/step_definitions/setup_steps.rb
+++ b/features/step_definitions/setup_steps.rb
@@ -1,5 +1,7 @@ Given /^the application is set up$/ do
# Using smackaho.st to give us automatic resolution to localhost
+ # N.B. This means some Cucumber scenarios will fail if your machine
+ # isn't connected to the internet. We shoud probably fix this.
#
# Port needs to be saved for Selenium tests (because our app code considers
# the port as well as the hostname when figuring out how to handle a
| Add note about smackaho.st use in Cucumber features.
|
diff --git a/arm-none-eabi-gcc.rb b/arm-none-eabi-gcc.rb
index abc1234..def5678 100644
--- a/arm-none-eabi-gcc.rb
+++ b/arm-none-eabi-gcc.rb
@@ -3,10 +3,10 @@ class ArmNoneEabiGcc < Formula
homepage 'https://developer.arm.com/open-source/gnu-toolchain/gnu-rm/downloads'
- version '6-2016-q4-update'
+ version '6-2017-q1-update'
- url 'https://developer.arm.com/-/media/Files/downloads/gnu-rm/6-2016q4/gcc-arm-none-eabi-6_2-2016q4-20161216-mac.tar.bz2'
- sha256 'cb52433610d0084ee85abcd1ac4879303acba0b6a4ecfe5a5113c09f0ee265f0'
+ url 'https://developer.arm.com/-/media/Files/downloads/gnu-rm/6_1-2017q1/gcc-arm-none-eabi-6-2017-q1-update-mac.tar.bz2'
+ sha256 'de4de95b09740272aa95ca5a43bb234ba29c323eddcad2ee34e901eebda910a2'
def install
system 'cp', '-r', 'arm-none-eabi', 'bin', 'lib', 'share', "#{prefix}/"
| Update ARM gcc to `6-2017-q1-update`
|
diff --git a/nio4r.gemspec b/nio4r.gemspec
index abc1234..def5678 100644
--- a/nio4r.gemspec
+++ b/nio4r.gemspec
@@ -5,7 +5,7 @@ gem.authors = ["Tony Arcieri"]
gem.email = ["tony.arcieri@gmail.com"]
gem.description = "New IO for Ruby"
- gem.summary = "NIO exposes a set of high performance IO operations on sockets, files, and other Ruby IO objects"
+ gem.summary = "NIO provides a high performance selector API for monitoring IO objects"
gem.homepage = "https://github.com/tarcieri/nio4r"
gem.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
@@ -14,6 +14,7 @@ gem.name = "nio4r"
gem.require_paths = ["lib"]
gem.version = NIO::VERSION
+ gem.extensions = ["ext/nio4r/extconf.rb"] unless defined?(JRUBY_VERSION)
gem.add_development_dependency "rake-compiler", "~> 0.7.9"
gem.add_development_dependency "rake"
| Disable native extension on JRuby
|
diff --git a/lib/rails_admin_tag_list/engine.rb b/lib/rails_admin_tag_list/engine.rb
index abc1234..def5678 100644
--- a/lib/rails_admin_tag_list/engine.rb
+++ b/lib/rails_admin_tag_list/engine.rb
@@ -1,4 +1,9 @@ module RailsAdminTagList
class Engine < ::Rails::Engine
+ initializer 'rails_admin_rag_list.action_controller' do |app|
+ ActiveSupport.on_load :action_controller do
+ helper RailsAdminTagList::SuggestionsHelper
+ end
+ end
end
end
| Include view helper module on initialization
|
diff --git a/lib/fezzik.rb b/lib/fezzik.rb
index abc1234..def5678 100644
--- a/lib/fezzik.rb
+++ b/lib/fezzik.rb
@@ -13,7 +13,7 @@ Rake::Task["fezzik:#{task}"].invoke
end
puts "[success]".green
- rescue SystemExit => e
+ rescue SystemExit, Rake::CommandFailedError => e
puts "[fail]".red
exit 1
rescue Exception => e
| Add support for catching errors from bin/run_app.sh to avoid dumping a stack trace.
|
diff --git a/spec/geezeo_spec.rb b/spec/geezeo_spec.rb
index abc1234..def5678 100644
--- a/spec/geezeo_spec.rb
+++ b/spec/geezeo_spec.rb
@@ -2,13 +2,18 @@
describe "Geezeo accounts" do
before(:each) do
- @client = Geezeo.client(credentials["api_key"], credentials["user_id"])
+ @geezeo = Geezeo.client(credentials["api_key"], credentials["user_id"])
end
-
it "gets a list of accounts" do
- @account = @client.accounts.all.first
+ @account = @geezeo.accounts.all.first
@account.id.should_not be_nil
end
+
+ it "gets the sum of all account balances" do
+ @balance = @geezeo.accounts.sum_of_balances
+
+ @balance.should be_kind_of(Float)
+ end
end
| Add second test 'it gets the sum of allaccount balances'
|
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index abc1234..def5678 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -12,7 +12,7 @@ rescue LoadError
nil
end
-
+Usable.logger.level = 0
RSpec.configure do |config|
config.raise_errors_for_deprecations!
# config.filter_run focus: true
| Set logger level to debug for tests
|
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index abc1234..def5678 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -8,10 +8,10 @@ end
require 'rspec'
-lib = File.expand_path('../ruby', File.dirname(__FILE__))
-unless $LOAD_PATH.include? lib
- $LOAD_PATH.unshift lib
-end
+ext = File.expand_path('../ruby/command-t/lib', File.dirname(__FILE__))
+lib = File.expand_path('../ruby/command-t/ext', File.dirname(__FILE__))
+$LOAD_PATH.unshift(ext) unless $LOAD_PATH.include?(ext)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
require 'command-t'
require 'command-t/ext'
| Adjust spec helper to account for new directory structure
Broken since 8ec8f73.
|
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index abc1234..def5678 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -26,4 +26,4 @@
component_name = "ahn_queue"
-AHN_QUEUE = ComponentTester.new(component_name, File.dirname(__FILE__) + "/../..", "/#{component_name}/lib/#{component_name}.rb")
+AHN_QUEUE = ComponentTester.new(component_name, File.dirname(__FILE__) + "/..", "/lib/#{component_name}.rb")
| Fix path to tested component |
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index abc1234..def5678 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,13 +1,15 @@ require 'pathname'
require 'rubygems'
-gem 'dm-core', '0.10.0'
-gem 'dm-validations', '0.10.0'
-
+gem 'dm-core', '0.10.0'
require 'dm-core'
-require 'dm-validations'
ROOT = Pathname(__FILE__).dirname.parent
+
+# use local dm-validations if running from dm-more directly
+lib = ROOT.parent / 'dm-validations' / 'lib'
+$LOAD_PATH.unshift(lib) if lib.directory?
+require 'dm-validations'
# use local dm-adjust if running from dm-more directly
lib = ROOT.parent / 'dm-types' / 'lib'
| [dm-more] Use the local dm-validations gem in specs if available
|
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index abc1234..def5678 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -20,7 +20,7 @@ end
RYODO_SPEC_ROOT = File.expand_path("..", __FILE__)
-RYODO_TMP_ROOT = File.expand_path("../../tmp", __FILE__)
+RYODO_TMP_ROOT = File.expand_path("../../tmp/spec", __FILE__)
Dir.mkdir RYODO_TMP_ROOT unless File.exists?(RYODO_TMP_ROOT)
| Modify ryodo temp spec folder |
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index abc1234..def5678 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,5 +1,3 @@-$:.unshift File.expand_path("../lib", __dir__)
-$:.unshift File.expand_path("..", __dir__)
require "mixlib/shellout"
require "tmpdir"
| Remove the path shifts in the spec helper
Signed-off-by: Tim Smith <764ef62106582a09ed09dfa0b6bff7c05fd7d1e4@chef.io>
|
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index abc1234..def5678 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,7 +1,10 @@-begin
- require "coveralls"
- Coveralls.wear!
-rescue LoadError
+# Send coveralls report on one job per build only
+ENV["TRAVIS_JOB_NUMBER"].to_s.end_with?(".1")
+ begin
+ require "coveralls"
+ Coveralls.wear!
+ rescue LoadError
+ end
end
RSpec.configure do |config|
| Send coveralls report on one job per build only
|
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index abc1234..def5678 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -34,8 +34,14 @@ end
config.before :suite do
- DatabaseCleaner.strategy = :truncation
- DatabaseCleaner.clean
+ DatabaseCleaner.strategy = :transaction
+ DatabaseCleaner.clean_with(:truncation)
+ end
+
+ config.around(:each) do |example|
+ DatabaseCleaner.cleaning do
+ example.run
+ end
end
end
end
| Clean database while testing more frequently
|
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index abc1234..def5678 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -2,6 +2,9 @@ require 'neo-tmdb'
require 'webmock/rspec'
require 'vcr'
+
+# Allow VCR to process real HTTP requests.
+WebMock.allow_net_connect!
VCR.configure do |config|
config.cassette_library_dir = 'spec/cassettes'
| Make WebMock allow network connections
|
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index abc1234..def5678 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -7,6 +7,12 @@
Dir["#{path}/spec/support/*.rb"].each {|file| require file}
+# Set default env parameters to prevent CI failing on pull requests
+ENV['UPS_LICENSE_NUMBER'] = '' unless ENV.key? 'UPS_LICENSE_NUMBER'
+ENV['UPS_USER_ID'] = '' unless ENV.key? 'UPS_USER_ID'
+ENV['UPS_PASSWORD'] = '' unless ENV.key? 'UPS_PASSWORD'
+ENV['UPS_ACCOUNT_NUMBER'] = '' unless ENV.key? 'UPS_ACCOUNT_NUMBER'
+
RSpec.configure do |c|
c.mock_with :rspec
c.include RSpec::XSD
| Set default env parameters to prevent CI failing on pull requests
|
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index abc1234..def5678 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -26,6 +26,8 @@
RSpec.configure do |config|
config.include Factory::Syntax::Methods
+ config.include EmailSpec::Helpers, type: :mailer
+ config.include EmailSpec::Matchers, type: :mailer
config.fixture_path = "#{::Rails.root}/spec/fixtures"
config.use_transactional_fixtures = true
config.infer_base_class_for_anonymous_controllers = false
| Add mail matchers to rspec.
|
diff --git a/spec/support/vcr.rb b/spec/support/vcr.rb
index abc1234..def5678 100644
--- a/spec/support/vcr.rb
+++ b/spec/support/vcr.rb
@@ -4,7 +4,10 @@ c.cassette_library_dir = 'spec/fixtures/cassettes'
c.hook_into :faraday
c.configure_rspec_metadata!
- c.default_cassette_options = { :record => :once }
+ c.default_cassette_options = {
+ :record => :once,
+ :match_requests_on => [:method, :uri_with_unordered_params]
+ }
# In recorded cassettes, replace these environment variable values with a
# placeholder like <VARIABLE>
@@ -15,5 +18,25 @@ placeholders.each do |placeholder|
c.filter_sensitive_data("<#{placeholder}>") { ENV[placeholder] }
end
+
+ # Between Faraday 0.8.x and 0.9, they started sorting the order of params when
+ # generating URIs:
+ #
+ # https://github.com/lostisland/faraday/issues/353
+ #
+ # The AngelList API should not care about query param ordering. Since
+ # Faraday's fate seems to be in question anyway [1], rather than bump our
+ # dependency requirement for now, a less strict request matcher works around
+ # the discrepancy for the test suite. Hat tip:
+ #
+ # https://github.com/vcr/vcr/wiki/Common-Custom-Matchers#uri-ignoring-query-parameter-ordering
+ #
+ # [1]: https://github.com/lostisland/faraday/issues/454
+ c.register_request_matcher :uri_with_unordered_params do |req1, req2|
+ uri1, uri2 = URI(req1.uri), URI(req2.uri)
+ uri1.scheme == uri2.scheme && uri1.host == uri2.host &&
+ uri1.path == uri2.path &&
+ CGI.parse(uri1.query || '') == CGI.parse(uri2.query || '')
+ end
end
| Work around Faraday 0.9 changing param ordering, for tests
Should close #35
|
diff --git a/lib/asteroids/componenets/game_object.rb b/lib/asteroids/componenets/game_object.rb
index abc1234..def5678 100644
--- a/lib/asteroids/componenets/game_object.rb
+++ b/lib/asteroids/componenets/game_object.rb
@@ -27,5 +27,11 @@ @removable = true
end
+ protected
+
+ def object_pool
+ @object_pool
+ end
+
end
end | Add method to game object class to return object pool.
|
diff --git a/ooxml_parser.gemspec b/ooxml_parser.gemspec
index abc1234..def5678 100644
--- a/ooxml_parser.gemspec
+++ b/ooxml_parser.gemspec
@@ -9,19 +9,7 @@ s.summary = 'OoxmlParser Gem'
s.description = 'Parse OOXML files (docx, xlsx, pptx)'
s.email = ['shockwavenn@gmail.com', 'rzagudaev@gmail.com']
- s.files = `git ls-files`.split($RS).reject do |file|
- file =~ %r{^(?:
- spec/.*
- |Gemfile
- |Rakefile
- |\.rspec
- |\.gitignore
- |\.rubocop.yml
- |\.rubocop_todo.yml
- |\.travis.yml
- |.*\.eps
- )$}x
- end
+ s.files = `git ls-files lib LICENSE.txt README.md `.split($RS)
s.add_runtime_dependency('nokogiri', '~> 1.6')
s.add_runtime_dependency('rubyzip', '~> 1.1')
s.add_runtime_dependency('xml-simple', '~> 1.1')
| Simplify expression for list of files in gemspec
Also solve problem with building gem with names with space in `spec` folder
|
diff --git a/lib/minfraud/components/shopping_cart.rb b/lib/minfraud/components/shopping_cart.rb
index abc1234..def5678 100644
--- a/lib/minfraud/components/shopping_cart.rb
+++ b/lib/minfraud/components/shopping_cart.rb
@@ -8,8 +8,11 @@ # @return [Array<Minfraud::Components::ShoppingCartItem>]
attr_accessor :items
- # @param params [Hash] Hash of parameters.
- def initialize(params = {})
+ # @param params [Array] Array of shopping cart items. You may provide
+ # each item as either as Hash where each key is a symbol corresponding
+ # to an item's field, or as a Minfraud:::Components::ShoppingCartItem
+ # object.
+ def initialize(params = [])
@items = params.map(&method(:resolve))
end
| Correct shopping cart constructor type
|
diff --git a/guides/check_typo.rb b/guides/check_typo.rb
index abc1234..def5678 100644
--- a/guides/check_typo.rb
+++ b/guides/check_typo.rb
@@ -9,5 +9,5 @@ ARGF.each do |line|
print ARGF.file.path, " ",
ARGF.file.lineno, ":",
- line if line.gsub!(/([へにおはがでな])\1/, '[[\&]]')
+ line if line.gsub!(/([へにおはがでな])\1/u, '[[\&]]')
end
| Use UTF-8 for for checking typo
|
diff --git a/cookbooks/lib/features/mysql_spec.rb b/cookbooks/lib/features/mysql_spec.rb
index abc1234..def5678 100644
--- a/cookbooks/lib/features/mysql_spec.rb
+++ b/cookbooks/lib/features/mysql_spec.rb
@@ -26,7 +26,7 @@ root
travis
).each do |mysql_user|
- describe command(%(mysql -u #{mysql_user} 'select "hai"')) do
+ describe command(%(mysql -u #{mysql_user} -e 'select "hai"')) do
its(:exit_status) { should eq 0 }
its(:stdout) { should match(/hai/) }
its(:stderr) { should be_empty }
| Add a missing `-e` :facepalm:
|
diff --git a/cookbooks/toolkit/recipes/default.rb b/cookbooks/toolkit/recipes/default.rb
index abc1234..def5678 100644
--- a/cookbooks/toolkit/recipes/default.rb
+++ b/cookbooks/toolkit/recipes/default.rb
@@ -30,8 +30,24 @@ repo "https://github.com/cyclestreets/toolkit.git"
revision "master"
user "www-data"
+ before_migrate do
+ current_release_directory = release_path
+ running_deploy_user = new_resource.user
+ bundler_depot = new_resource.shared_path + '/bundle'
+ excluded_groups = %w(development test)
+
+ script 'Bundling the gems' do
+ interpreter 'bash'
+ cwd current_release_directory
+ user running_deploy_user
+ code <<-EOS
+ bundle install --quiet --deployment --path #{bundler_depot} \
+ --without #{excluded_groups.join(' ')}
+ EOS
+ end
+ end
migrate true
- migration_command "rake db:migrate"
+ migration_command "bundle exec rake db:migrate"
environment "RAILS_ENV" => "production"
action :deploy
restart_command "touch tmp/restart.txt"
| Use bundle to install all the gems
|
diff --git a/pseudo_model.gemspec b/pseudo_model.gemspec
index abc1234..def5678 100644
--- a/pseudo_model.gemspec
+++ b/pseudo_model.gemspec
@@ -16,4 +16,6 @@ gem.executables = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
gem.require_paths = ["lib"]
+
+ gem.add_dependency 'activemodel', '~> 3.2'
end
| Add ActiveModel as a gem dependency. |
diff --git a/lib/action_tracker.rb b/lib/action_tracker.rb
index abc1234..def5678 100644
--- a/lib/action_tracker.rb
+++ b/lib/action_tracker.rb
@@ -9,6 +9,6 @@ module ActionTracker
if defined?(Rails)
require 'action_tracker/engine'
- ActiveSupport.on_load(:action_controller) { include ActionTracker::Concerns::Tracker }
+ ActiveSupport.on_load(:action_controller) { ::ActionController::Base.include ActionTracker::Concerns::Tracker }
end
end
| Change to work on rails 5.0 |
diff --git a/lib/bootstrap-sass.rb b/lib/bootstrap-sass.rb
index abc1234..def5678 100644
--- a/lib/bootstrap-sass.rb
+++ b/lib/bootstrap-sass.rb
@@ -17,6 +17,8 @@ else
raise Bootstrap::FrameworkNotFound, "bootstrap-sass requires either Rails > 3.1 or Compass, neither of which are loaded"
end
+ stylesheets = File.expand_path(File.join("..", 'vendor', 'assets', 'stylesheets'))
+ Sass.load_paths << stylesheets
end
private
| Add Sass.load_paths entry to help absolute @import paths
Nice feature added in Sass 2.3 - see nex3/sass@5c93cbfe
This should resolve thomas-mcdonald/bootstrap-sass#259 better than making users manually adding a load_paths entry.
|
diff --git a/lib/puppet/type/php_extension.rb b/lib/puppet/type/php_extension.rb
index abc1234..def5678 100644
--- a/lib/puppet/type/php_extension.rb
+++ b/lib/puppet/type/php_extension.rb
@@ -17,8 +17,23 @@ isnamevar
end
+ newparam(:extension) do
+ end
+
newparam(:version) do
defaultto '>= 0'
end
+ newparam(:package_name) do
+ end
+
+ newparam(:package_url) do
+ end
+
+ newparam(:phpenv_root) do
+ end
+
+ newparam(:php_version) do
+ end
+
end
| Add extra params to extension type
|
diff --git a/lib/lurker/plugins.rb b/lib/lurker/plugins.rb
index abc1234..def5678 100644
--- a/lib/lurker/plugins.rb
+++ b/lib/lurker/plugins.rb
@@ -1,5 +1,6 @@ module Lurker
module Plugins
+ # @TODO Save and load this stuff from a YAML file
def plugins
@plugins ||= {
:Logger => true,
| Load plugin information from file
|
diff --git a/Formula/xdebug.rb b/Formula/xdebug.rb
index abc1234..def5678 100644
--- a/Formula/xdebug.rb
+++ b/Formula/xdebug.rb
@@ -7,6 +7,9 @@
def install
Dir.chdir 'xdebug-2.0.5' do
+ # See http://github.com/mxcl/homebrew/issues/#issue/69
+ ENV.universal_binary unless Hardware.is_64_bit?
+
system "phpize"
system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking",
"--enable-xdebug"
@@ -17,14 +20,14 @@
def caveats
<<-END_CAVEATS
- Add the following line to php.ini:
- zend_extension="#{prefix}/xdebug.so"
+Add the following line to php.ini:
- Restart your webserver.
+ zend_extension="#{prefix}/xdebug.so"
- Write a PHP page that calls "phpinfo();" Load it in a browser and
- look for the info on the xdebug module. If you see it, you have been
- successful!
+Restart your webserver.
+
+Write a PHP page that calls "phpinfo();" Load it in a browser and look for the
+info on the xdebug module. If you see it, you have been successful!
END_CAVEATS
end
end
| Build a universal binary on Leopard
Fixes Homebrew/homebrew#69
|
diff --git a/lib/xommelier/xml/element/dsl.rb b/lib/xommelier/xml/element/dsl.rb
index abc1234..def5678 100644
--- a/lib/xommelier/xml/element/dsl.rb
+++ b/lib/xommelier/xml/element/dsl.rb
@@ -20,16 +20,16 @@
private
- def define_text_accessors
- define_method(:text) { read_text }
- define_method(:text=) { |value| write_text(value) }
- end
-
def define_element_accessors(name)
case elements[name][:count]
when :one, :may
- define_method(name) { read_element(name) }
- define_method("#{name}=") { |value| write_element(name, value) }
+ define_method(name) do |*args|
+ if args[0]
+ write_element(name, args[0])
+ end
+ read_element(name)
+ end
+ alias_method "#{name}=", name
when :many
define_method(name) {
@elements[name] ||= []
@@ -42,8 +42,23 @@ end
def define_attribute_accessors(name)
- define_method(name) { read_attribute(name) }
- define_method("#{name}=") { |value| write_attribute(name, value) }
+ define_method(name) do |*args|
+ if args[0]
+ write_attribute(name, args[0])
+ end
+ read_attribute(name)
+ end
+ alias_method "#{name}=", name
+ end
+
+ def define_text_accessors
+ define_method(:text) do |*args|
+ if args[0]
+ write_text(args[0])
+ end
+ read_text
+ end
+ alias_method :text=, :text
end
end
end
| Make element, attribute and text accessors getters | setters without or with value sent as first parameter
|
diff --git a/lib/qb/role/errors.rb b/lib/qb/role/errors.rb
index abc1234..def5678 100644
--- a/lib/qb/role/errors.rb
+++ b/lib/qb/role/errors.rb
@@ -1,3 +1,13 @@+# Refinements
+# =======================================================================
+
+require 'nrser/refinements'
+using NRSER
+
+
+# Definitions
+# =======================================================================
+
module QB
class Role
# raised by `.require` when no roles match input
@@ -19,16 +29,14 @@ @input = input
@matches = matches
- super <<-END
-multiple roles match input #{ @input.inspect }:\
-
-#{
- @matches.map { |role|
- "- #{ role.to_s } (#{ role.path.to_s })"
- }.join("\n")
-}
-
-END
+ super binding.erb <<-END
+ multiple roles match input <%= @input.inspect %>:
+
+ <% @matches.map do |role| %>
+ - <%= role.to_s %> (<%= role.path.to_s %>)
+ <% end %>
+
+ END
end
end
| Make an error message nicer using binding.erb
|
diff --git a/lib/rubycritic/cli.rb b/lib/rubycritic/cli.rb
index abc1234..def5678 100644
--- a/lib/rubycritic/cli.rb
+++ b/lib/rubycritic/cli.rb
@@ -19,7 +19,7 @@ end.parse!
ARGV << "." if ARGV.empty?
- Rubycritic.new.critique(ARGV)
+ puts "New critique at #{Rubycritic.new.critique(ARGV)}"
exit 0
end
| Print the href of the smells index page after running
|
diff --git a/lib/schreihals/app.rb b/lib/schreihals/app.rb
index abc1234..def5678 100644
--- a/lib/schreihals/app.rb
+++ b/lib/schreihals/app.rb
@@ -25,7 +25,7 @@ end
def render_page(slug)
- if @post = Post.with_slug(slug)
+ if @post = Post.where(slugs: slug).first
haml :post
else
halt 404
| Fix rendering of individual posts. |
diff --git a/quickeebooks.gemspec b/quickeebooks.gemspec
index abc1234..def5678 100644
--- a/quickeebooks.gemspec
+++ b/quickeebooks.gemspec
@@ -21,7 +21,6 @@
gem.add_development_dependency 'rake'
gem.add_development_dependency 'simplecov'
- gem.add_development_dependency 'rr', '~> 1.0.2'
gem.add_development_dependency 'rspec', '2.13.0'
gem.add_development_dependency 'fakeweb'
gem.add_development_dependency 'guard', '1.8.0'
| Remove RR as a dependency
We should not have dependencies in the gemspec that are not being used
anywhere even if they are development dependencies.
|
diff --git a/lib/tasks/errors.rake b/lib/tasks/errors.rake
index abc1234..def5678 100644
--- a/lib/tasks/errors.rake
+++ b/lib/tasks/errors.rake
@@ -19,6 +19,10 @@ def asset_data(path)
File.read(Rails.root.join('app', 'assets', 'images', path))
end
+
+ def home_page?
+ false
+ end
end
%w[404 422 500 503].each do |status|
| Add home_page? method to error view context
THe header partial now uses the home_page? method to decide whether to
make the site name a link or not so we need to add that to our context.
https://www.pivotaltracker.com/story/show/99040670
|
diff --git a/lib/tasks/resque.rake b/lib/tasks/resque.rake
index abc1234..def5678 100644
--- a/lib/tasks/resque.rake
+++ b/lib/tasks/resque.rake
@@ -11,7 +11,7 @@ require Rails.root.join('config/environment')
end
- # Close DB connections before forking a worker.
+ # Close DB connections. No need for processes to hold open connections.
Resque.before_fork do
ActiveRecord::Base.clear_all_connections!
end
| Update comment in Resque Pool rake task to clarify
|
diff --git a/spec/heidi_spec.rb b/spec/heidi_spec.rb
index abc1234..def5678 100644
--- a/spec/heidi_spec.rb
+++ b/spec/heidi_spec.rb
@@ -3,6 +3,10 @@ describe Heidi do
before(:all) do
fake_me_a_heidi
+ end
+
+ after(:all) do
+ FileUtils.remove_entry_secure @fake
end
it "should gather projects on load" do
| Remove fake heidi when done
|
diff --git a/spec/support/db.rb b/spec/support/db.rb
index abc1234..def5678 100644
--- a/spec/support/db.rb
+++ b/spec/support/db.rb
@@ -1,3 +1,9 @@+ActiveRecord::Base.connection.tables.each do |t|
+ ActiveRecord::Base.connection.foreign_keys(t).each do |fk|
+ ActiveRecord::Base.connection.remove_foreign_key t, fk.options
+ end
+end
+
ActiveRecord::Base.connection.tables.each do |t|
ActiveRecord::Base.connection.drop_table t
end
| Fix specs repetition with MySQL
|
diff --git a/spec/users_spec.rb b/spec/users_spec.rb
index abc1234..def5678 100644
--- a/spec/users_spec.rb
+++ b/spec/users_spec.rb
@@ -0,0 +1,42 @@+require 'spec_helper'
+
+describe "gitlab::users" do
+ let(:chef_run) { ChefSpec::Runner.new.converge("gitlab::users") }
+
+
+ describe "under ubuntu" do
+ ["12.04", "10.04"].each do |version|
+ let(:chef_run) do
+ runner = ChefSpec::Runner.new(platform: "ubuntu", version: version)
+ runner.node.set['gitlab']['env'] = "production"
+ runner.converge("gitlab::users")
+ end
+
+ it "creates a user that will run gitlab" do
+ expect(chef_run).to create_user('git')
+ end
+
+ it 'locks a created user' do
+ expect(chef_run).to lock_user('git')
+ end
+ end
+ end
+
+ describe "under centos" do
+ ["5.8", "6.4"].each do |version|
+ let(:chef_run) do
+ runner = ChefSpec::Runner.new(platform: "centos", version: version)
+ runner.node.set['gitlab']['env'] = "production"
+ runner.converge("gitlab::users")
+ end
+
+ it "creates a user that will run gitlab" do
+ expect(chef_run).to create_user('git')
+ end
+
+ it 'locks a created user' do
+ expect(chef_run).to lock_user('git')
+ end
+ end
+ end
+end | Add a users recipe spec.
|
diff --git a/smirk.gemspec b/smirk.gemspec
index abc1234..def5678 100644
--- a/smirk.gemspec
+++ b/smirk.gemspec
@@ -1,8 +1,8 @@ Gem::Specification.new do |s|
s.name = "smirk"
- s.version = "0.2.0"
+ s.version = "0.2.1"
s.authors = ["James Miller"]
- s.date = "2010-02-22"
+ s.date = "2010-05-18"
s.summary = %q{Ruby wrapper for the SmugMug API}
s.description = %q{Smirk is a simple Ruby wrapper for the SmugMug 1.2.2 API specification. It currently supports initiating a session, finding albums, images, and categories.}
s.homepage = "http://github.com/bensie/smirk"
| Update date and bump to 0.2.1
|
diff --git a/lib/flintlock/cli.rb b/lib/flintlock/cli.rb
index abc1234..def5678 100644
--- a/lib/flintlock/cli.rb
+++ b/lib/flintlock/cli.rb
@@ -9,17 +9,18 @@ method_option :debug, :type => :boolean, :description => "enable debug output", :default => false
def deploy(uri, app_dir)
mod = get_module(uri, options)
- say_status "deploy", "#{mod.full_name} to '#{app_dir}'"
+ say_status "info", "deploying #{mod.full_name} to '#{app_dir}'", :blue
say_status "create", "creating deploy directory"
mod.create_app_dir(app_dir) rescue abort("deploy directory is not empty")
- say_status "prepare", "installing and configuring dependencies"
+ say_status "run", "installing and configuring dependencies", :magenta
mod.prepare
- say_status "stage", "staging application files"
+ say_status "create", "staging application files"
mod.stage(app_dir)
- say_status "start", "launching the application"
+ say_status "run", "launching the application", :magenta
mod.start(app_dir)
- say_status "modify", "altering application runtime environment"
+ say_status "run", "altering application runtime environment", :magenta
mod.modify(app_dir)
+ say_status "info", "complete!", :blue
end
private
| Change CLI output a bit
|
diff --git a/lib/her/model/orm.rb b/lib/her/model/orm.rb
index abc1234..def5678 100644
--- a/lib/her/model/orm.rb
+++ b/lib/her/model/orm.rb
@@ -23,7 +23,7 @@ end # }}}
# Fetch a specific resource based on an ID
- def find(id) # {{{
+ def find(id, params={}) # {{{
request(params.merge(:_method => :get, :_path => "#{@her_collection_path}/#{id}")) do |parsed_data|
new(parsed_data[:resource])
end
| Fix missing params in ORM.find
|
diff --git a/app/models/lab.rb b/app/models/lab.rb
index abc1234..def5678 100644
--- a/app/models/lab.rb
+++ b/app/models/lab.rb
@@ -3,7 +3,7 @@ belongs_to :lab_description
# Returns all labs for given group
- def self.find_by_group(group_íd)
+ def self.find_by_group(group_id)
end
end
| Remove strange char from code
|
diff --git a/lib/typhoeus/pool.rb b/lib/typhoeus/pool.rb
index abc1234..def5678 100644
--- a/lib/typhoeus/pool.rb
+++ b/lib/typhoeus/pool.rb
@@ -18,10 +18,8 @@ # @example Release easy.
# hydra.release_easy(easy)
def release(easy)
- @mutex.synchronize do
- easy.reset
- easies << easy
- end
+ easy.reset
+ @mutex.synchronize { easies << easy }
end
# Return an easy from pool.
@@ -31,19 +29,18 @@ #
# @return [ Ethon::Easy ] The easy.
def get
- @mutex.synchronize do
- easies.pop || Ethon::Easy.new
- end
+ @mutex.synchronize { easies.pop } || Ethon::Easy.new
end
def clear
- easies.clear
+ @mutex.synchronize { easies.clear }
end
def with_easy(&block)
easy = get
yield easy
- release easy
+ ensure
+ release(easy) if easy
end
private
| Synchronize Typhoeus::Pool.clear and small improvements.
|
diff --git a/libraries/helpers.rb b/libraries/helpers.rb
index abc1234..def5678 100644
--- a/libraries/helpers.rb
+++ b/libraries/helpers.rb
@@ -0,0 +1,63 @@+# Copyright (c) 2013, Rackspace Hosting
+
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+module Margarine
+ module Helpers
+ # Public: Put components together into a valid URI.
+ #
+ # components - The Hash containing the following items and optionally
+ # any others: type, username, password, hostname, port, and
+ # database.
+ #
+ # Returns the URI based on the components.
+ def uri(components)
+ str = ''
+
+ if _ = components.fetch('type', nil)
+ str << _
+ str << '://'
+ end
+
+ if _ = components.fetch('username', nil)
+ str << _
+ if _ = components.fetch('password', nil)
+ str << ':'
+ str << _
+ end
+ str << '@'
+ end
+
+ if _ = components.fetch('hostname', nil)
+ str << _
+ end
+
+ if _ = components.fetch('port', nil)
+ str << ':'
+ str << _.to_s
+ end
+
+ if _ = components.fetch('database', nil)
+ str << '/'
+ str << _
+ end
+ end
+
+ end
+end
| Add hepler library for templates.
The margarine.ini template uses a uri helper function to simplify
creation of the URIs in that file.
|
diff --git a/test/tests.rb b/test/tests.rb
index abc1234..def5678 100644
--- a/test/tests.rb
+++ b/test/tests.rb
@@ -7,17 +7,17 @@ $: << File.join($oj_dir, dir)
end
-require 'test_strict'
-require 'test_null'
require 'test_compat'
-require 'test_object'
require 'test_custom'
-require 'test_writer'
require 'test_fast'
-require 'test_hash'
require 'test_file'
require 'test_gc'
+require 'test_hash'
+require 'test_null'
+require 'test_object'
require 'test_saj'
require 'test_scp'
+require 'test_strict'
require 'test_various'
require 'test_wab'
+require 'test_writer'
| Order required test files by there name
"test/tests.rb" is a file which runs other test files.
Ordering required test files helps us to detect wihich
files are loaded.
|
diff --git a/cancancan.gemspec b/cancancan.gemspec
index abc1234..def5678 100644
--- a/cancancan.gemspec
+++ b/cancancan.gemspec
@@ -15,7 +15,9 @@ s.license = "MIT"
s.files = Dir["{lib,spec}/**/*", "[A-Z]*", "init.rb"] - ["Gemfile.lock"]
- s.require_path = "lib"
+ s.require_paths = ["lib"]
+ s.required_ruby_version = Gem::Requirement.new(">= 1.8.7")
+ s.required_rubygems_version = ">= 1.3.4"
s.add_development_dependency 'rspec', '~> 2.14'
s.add_development_dependency 'guard'
@@ -23,5 +25,4 @@ s.add_development_dependency 'appraisal', '>= 1.0.0.beta3'
s.rubyforge_project = s.name
- s.required_rubygems_version = ">= 1.3.4"
end
| Update gem spec with more modern configs. |
diff --git a/app/helpers/charities_helper.rb b/app/helpers/charities_helper.rb
index abc1234..def5678 100644
--- a/app/helpers/charities_helper.rb
+++ b/app/helpers/charities_helper.rb
@@ -1,2 +1,35 @@ module CharitiesHelper
+ def initialize
+ @account_name = account_name
+ @api_key = api_key
+ end
+
+ def hello_world(name)
+ call :hellowWorld, {:name => name}.to_json
+ end
+
+ protected
+
+ def call(action, json_query)
+ nonce = Digest::SHA2.hexdigest(rand.to_s)[0, 20]
+ creation_time = Time.now.utc.strftime("%Y-%m-%dT%H:%M:%S%z")
+ password_digest = Base64.encode64(Digest::SHA2.digest(nonce + creation_time + @api_key)).chomp
+ url = URI.parse("http://www.volunteermatch.org/api/call?action=#{action.to_s}&query=" + URI.encode(json_query))
+
+ req = Net::HTTP::Get.new(url.request_uri)
+ req.add_field('Content-Type', 'application/json')
+ req.add_field('Authorization', 'WSSE profile="UsernameToken"')
+ req.add_field('X-WSSE', 'UsernameToken Username="' + @account_name + '", PasswordDigest="' + password_digest + '", ' +
+ 'Nonce="' + nonce + '", Created="' + creation_time + '"')
+
+ res = Net::HTTP.new(url.host, url.port).start { |http| http.request(req) }
+ raise "HTTP error code #{res.code}" unless res.code == "200"
+ OpenStruct.new(JSON.parse res.body)
+ end
+
end
+
+api = VolunteerMatchApi.new(account_name, api_key)
+response = api.hello_world("VolunteerMatch") # JSON {"name":"VolunteerMatch","result":"Hello VolunteerMatch!"}
+puts response.name # "VolunteerMatch"
+puts response.result # "Hello VolunteerMatch!"
| Add api code from the volunteermatch git hub
|
diff --git a/fabrication.gemspec b/fabrication.gemspec
index abc1234..def5678 100644
--- a/fabrication.gemspec
+++ b/fabrication.gemspec
@@ -29,6 +29,6 @@ s.add_development_dependency("sequel")
s.add_development_dependency("sqlite3")
- s.files = Dir.glob("{lib,spec}/**/*") + %w(LICENSE README.markdown Rakefile)
+ s.files = Dir.glob("lib/**/*") + %w(LICENSE README.markdown Rakefile)
s.require_path = 'lib'
end
| Remove spec folder from distributed gem
|
diff --git a/chef-zero.gemspec b/chef-zero.gemspec
index abc1234..def5678 100644
--- a/chef-zero.gemspec
+++ b/chef-zero.gemspec
@@ -6,8 +6,8 @@ s.version = ChefZero::VERSION
s.summary = "Self-contained, easy-setup, fast-start in-memory Chef server for testing and solo setup purposes"
s.description = s.summary
- s.author = "John Keiser"
- s.email = "jkeiser@chef.io"
+ s.author = "Chef Software, Inc."
+ s.email = "oss@chef.io"
s.homepage = "https://github.com/chef/chef-zero"
s.license = "Apache-2.0"
| Update the gem owner to be Chef
Signed-off-by: Tim Smith <764ef62106582a09ed09dfa0b6bff7c05fd7d1e4@chef.io>
|
diff --git a/app/models/contentful_client.rb b/app/models/contentful_client.rb
index abc1234..def5678 100644
--- a/app/models/contentful_client.rb
+++ b/app/models/contentful_client.rb
@@ -12,6 +12,6 @@ end
def carousel_items
- @client.entries('content_type' => '5AYS9ZskFiUiYCc8owESc', 'order' => 'sys.createdAt')
+ @client.entries(content_type: '5AYS9ZskFiUiYCc8owESc', order: 'sys.createdAt')
end
end | Use proper hash syntax for carousel items
|
diff --git a/app/models/country_statistic.rb b/app/models/country_statistic.rb
index abc1234..def5678 100644
--- a/app/models/country_statistic.rb
+++ b/app/models/country_statistic.rb
@@ -29,6 +29,7 @@ (overseas_total_protected_marine_area / overseas_total_marine_area) * 100
end
+ # TODO Need confirmation regarding this calculation
[:land, :marine].each do |type|
field_name = "percentage_pa_#{type}_cover"
define_singleton_method("global_#{field_name}") do
| Add comment that calculation needs to be confirmed
|
diff --git a/app/models/variant_decorator.rb b/app/models/variant_decorator.rb
index abc1234..def5678 100644
--- a/app/models/variant_decorator.rb
+++ b/app/models/variant_decorator.rb
@@ -4,6 +4,6 @@ before_save :set_or_update_initial_count
def set_or_update_initial_count
- initial_count_on_hand = [initial_count_on_hand, count_on_hand].max
+ initial_count_on_hand = [initial_count_on_hand.to_i, count_on_hand.to_i].max
end
end
| Make sure comparision is possible.
|
diff --git a/test/unit/i_base_info_test.rb b/test/unit/i_base_info_test.rb
index abc1234..def5678 100644
--- a/test/unit/i_base_info_test.rb
+++ b/test/unit/i_base_info_test.rb
@@ -1,11 +1,11 @@ require File.expand_path('../test_helper.rb', File.dirname(__FILE__))
-describe GirFFI::IBaseInfo do
+describe GObjectIntrospection::IBaseInfo do
describe "#safe_name" do
it "makes names starting with an underscore safe" do
stub(ptr = Object.new).null? { false }
- info = GirFFI::IBaseInfo.wrap ptr
+ info = GObjectIntrospection::IBaseInfo.wrap ptr
stub(info).name { "_foo" }
| Fix namespace of IBaseInfo in merged test.
|
diff --git a/config/schedule.rb b/config/schedule.rb
index abc1234..def5678 100644
--- a/config/schedule.rb
+++ b/config/schedule.rb
@@ -21,4 +21,5 @@
every 5.minutes do
runner "MailboxReader.process_all_mailboxes"
+ env :MAILTO, 'cyclescape-errors@cyclestreets.net'
end
| Send cron emails to a third-party address.
This means they might get noticed, and also saves filling the database with emails, especially
when the emails are regarding emails not being processed.
Fixes https://github.com/cyclestreets/toolkit-chef/issues/13
|
diff --git a/app/uploaders/asset_uploader.rb b/app/uploaders/asset_uploader.rb
index abc1234..def5678 100644
--- a/app/uploaders/asset_uploader.rb
+++ b/app/uploaders/asset_uploader.rb
@@ -7,7 +7,7 @@ def store_dir
id = model.id.to_s
path = id.scan(/\d{2}/)[0..1].join("/")
- "#{Rails.root}/uploads/assets/#{path}/#{id}"
+ "#{ENV['GOVUK_APP_ROOT']}/uploads/assets/#{path}/#{id}"
end
def cache_dir
| Use GOVUK_APP_ROOT rather than Rails.root to find out the working dir
When referring to files, it's better if we use the
environment-provided variables instead of letting Rails try to work
out it out.
|
diff --git a/app/models/contestant.rb b/app/models/contestant.rb
index abc1234..def5678 100644
--- a/app/models/contestant.rb
+++ b/app/models/contestant.rb
@@ -28,4 +28,19 @@ validates :mentoring_teacher_first_name, presence: true
validates :mentoring_teacher_last_name, presence: true
+ def first_name
+ user.first_name
+ end
+
+ def last_name
+ user.last_name
+ end
+
+ rails_admin do
+ list do
+ field :first_name
+ field :last_name
+ field :school_name
+ end
+ end
end
| Make things pretty in rails admin
|
diff --git a/app/models/featurable.rb b/app/models/featurable.rb
index abc1234..def5678 100644
--- a/app/models/featurable.rb
+++ b/app/models/featurable.rb
@@ -9,7 +9,8 @@ feature_lists.find_by(locale: locale) || feature_lists.build(locale: locale)
end
- def load_or_create_feature_list(locale)
- feature_lists.find_by(locale: locale) || feature_lists.create(locale: locale)
+ def load_or_create_feature_list(locale = nil)
+ locale = I18n.default_locale if locale.blank?
+ feature_lists.find_by(locale: locale) || feature_lists.create!(locale: locale)
end
end
| Fix the remaining cucumber tests
params[:locale] is blank when the /features path
is requested without a locale suffix. This was
causing a validation error when creating the
feature list and the view was failing to render
because the path helper was missing a
feature_list_id param. |
diff --git a/AttributedLib.podspec b/AttributedLib.podspec
index abc1234..def5678 100644
--- a/AttributedLib.podspec
+++ b/AttributedLib.podspec
@@ -1,6 +1,6 @@ Pod::Spec.new do |s|
s.name = 'AttributedLib'
- s.version = '2.2.0'
+ s.version = '2.2.1'
s.summary = 'Modern Swift µframework for attributed strings.'
s.description = <<-DESC
| Update podspec for release 2.2.1
|
diff --git a/Casks/micro-snitch.rb b/Casks/micro-snitch.rb
index abc1234..def5678 100644
--- a/Casks/micro-snitch.rb
+++ b/Casks/micro-snitch.rb
@@ -6,5 +6,20 @@ name 'Micro Snitch'
homepage 'https://www.obdev.at/products/microsnitch/index.html'
+ auto_updates true
+ depends_on macos: '>= :el_capitan'
+
app 'Micro Snitch.app'
+
+ uninstall quit: 'at.obdev.MicroSnitch',
+ launchctl: 'at.obdev.MicroSnitchOpenAtLoginHelper'
+
+ zap trash: [
+ '~/Library/Application Support/at.obdev.MicroSnitchOpenAtLoginHelper',
+ '~/Library/Application Support/Micro Snitch',
+ '~/Library/Caches/at.obdev.MicroSnitch',
+ '~/Library/Containers/at.obdev.MicroSnitchOpenAtLoginHelper',
+ '~/Library/Logs/Micro Snitch.log',
+ '~/Library/Preferences/at.obdev.MicroSnitch.plist',
+ ]
end
| Add auto_updates, depends_on, uninstall and zap |
diff --git a/Casks/screenmailer.rb b/Casks/screenmailer.rb
index abc1234..def5678 100644
--- a/Casks/screenmailer.rb
+++ b/Casks/screenmailer.rb
@@ -2,10 +2,10 @@ version :latest
sha256 :no_check
- url 'http://www.screenmailer.com/download'
- appcast 'http://www.screenmailer.com/releases/current/releases.xml'
+ url 'https://www.screenmailer.com/releases/current/Screenmailer.zip'
+ appcast 'https://www.screenmailer.com/releases/current/releases.xml'
name 'Screenmailer'
- homepage 'http://www.screenmailer.com'
+ homepage 'https://www.screenmailer.com/'
license :unknown # todo: change license and remove this comment; ':unknown' is a machine-generated placeholder
app 'Screenmailer.app'
| Fix url, appcast and homepage to use SSL in Screenmailer Cask
The new url is from the appcast entry.
The HTTP URL is already getting redirected to HTTPS. Using the HTTPS URL directly
makes it more secure and saves a HTTP round-trip.
|
diff --git a/test/test_quill_builder_html.rb b/test/test_quill_builder_html.rb
index abc1234..def5678 100644
--- a/test/test_quill_builder_html.rb
+++ b/test/test_quill_builder_html.rb
@@ -0,0 +1,37 @@+require 'helper'
+require 'quill/builder/html'
+
+class Quill::Builder::HTML::Test < Test::Unit::TestCase
+ def test_convert_text_only
+ input = {
+ ops: [
+ { insert: "aaa\nbbb\n" },
+ ]
+ }
+ output = Quill::Builder::HTML.new(input.to_json).convert_intermediate
+ expect = [
+ { attrs: [], text: "aaa\nbbb\n" }
+ ]
+ assert_equal(expect, output)
+ end
+
+ def test_convert_inline_only
+ input = {
+ ops: [
+ { insert: 'a' },
+ {
+ attributes: { bold: true },
+ insert: 'aaaa'
+ },
+ { insert: "a\n" }
+ ]
+ }
+ output = Quill::Builder::HTML.new(input.to_json).convert_intermediate
+ expect = [
+ { text: 'a', attrs: [] },
+ { text: 'aaaa', attrs: [["<b>", "</b>"]] },
+ { text: "a\n", attrs: [] }
+ ]
+ assert_equal(expect, output)
+ end
+end
| Add tests, test_convert_text_only and test_convert_inline_only
|
diff --git a/lib/origen/core_ext/bignum.rb b/lib/origen/core_ext/bignum.rb
index abc1234..def5678 100644
--- a/lib/origen/core_ext/bignum.rb
+++ b/lib/origen/core_ext/bignum.rb
@@ -1,36 +1,38 @@-class Bignum
- # Extend Fixnum to enable 10.cycles
- def cycles
- if block_given?
- times do
- yield
- Origen.app.tester.cycle
+unless Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.4.0')
+ class Bignum
+ # Extend Fixnum to enable 10.cycles
+ def cycles
+ if block_given?
+ times do
+ yield
+ Origen.app.tester.cycle
+ end
+ else
+ Origen.app.tester.cycle(repeat: self)
end
- else
- Origen.app.tester.cycle(repeat: self)
end
+ alias_method :cycle, :cycles
+
+ alias_method :old_bit_select, :[]
+ def [](*args)
+ if args.length == 1 && !args.first.is_a?(Range)
+ old_bit_select(args.first)
+ else
+ if args.first.is_a?(Range)
+ msb = args.first.first
+ lsb = args.first.last
+ else
+ msb = args.first
+ lsb = args.last
+ end
+ (self >> lsb) & 0.ones_comp(msb - lsb + 1)
+ end
+ end
+
+ def ones_comp(num_bits)
+ self ^ ((1 << num_bits) - 1)
+ end
+ alias_method :ones_complement, :ones_comp
+ alias_method :ones_compliment, :ones_comp
end
- alias_method :cycle, :cycles
-
- alias_method :old_bit_select, :[]
- def [](*args)
- if args.length == 1 && !args.first.is_a?(Range)
- old_bit_select(args.first)
- else
- if args.first.is_a?(Range)
- msb = args.first.first
- lsb = args.first.last
- else
- msb = args.first
- lsb = args.last
- end
- (self >> lsb) & 0.ones_comp(msb - lsb + 1)
- end
- end
-
- def ones_comp(num_bits)
- self ^ ((1 << num_bits) - 1)
- end
- alias_method :ones_complement, :ones_comp
- alias_method :ones_compliment, :ones_comp
end
| Patch for Ruby 2.4.0 compatibility
|
diff --git a/lib/stack_master/validator.rb b/lib/stack_master/validator.rb
index abc1234..def5678 100644
--- a/lib/stack_master/validator.rb
+++ b/lib/stack_master/validator.rb
@@ -11,9 +11,10 @@ template_body = TemplateCompiler.compile(@stack_definition.template_file_path)
cf.validate_template(template_body: template_body)
StackMaster.stdout.puts "valid"
+ true
rescue Aws::CloudFormation::Errors::ValidationError => e
- StackMaster.stdout.puts "invalid"
- $stderr.puts e.message
+ StackMaster.stdout.puts "invalid. #{e.message}"
+ false
end
private
| Return false when validation fails
|
diff --git a/traut.gemspec b/traut.gemspec
index abc1234..def5678 100644
--- a/traut.gemspec
+++ b/traut.gemspec
@@ -7,7 +7,7 @@ s.version = Traut::VERSION
s.authors = ["Brian L. Troutwine"]
s.email = ["brian.troutwine@carepilot.com"]
- s.homepage = ""
+ s.homepage = "https://github.com/CarePilot/Traut"
s.summary = %q{Turns AMQP events to system command execution}
s.description = %q{Traut is a configurable daemon for running localhost commands in response to events generated elsewhere. AMQP is used as the interchange. Traut can make application deployments in response to code checkins, automate database failover and anything else that can be scripted. It needs only companions to pump events through the 'traut' exchange.}
| Include homepage value, points to GitHub project.
Signed-off-by: Brian L. Troutwine <760e7dab2836853c63805033e514668301fa9c47@troutwine.us>
|
diff --git a/.chef/knife.rb b/.chef/knife.rb
index abc1234..def5678 100644
--- a/.chef/knife.rb
+++ b/.chef/knife.rb
@@ -18,5 +18,5 @@ knife[:aws_ssh_key_id] = ENV['USER']
knife[:region] = "us-east-1"
knife[:flavor] = "m1.medium"
-knife[:image] = "ami-7ce17315" # Debian 6.0.7 (Squeeze)
+knife[:image] = "ami-4d20a724" # Debian 6.0.6 (Squeeze)
knife[:ssh_user] = "admin"
| Downgrade the Debian AMI to 6.0.6
The new Debian image is missing ca-certificates package, and
thus downloading the omnibus installer with SSL fails.
|
diff --git a/lib/vmdb/permission_stores.rb b/lib/vmdb/permission_stores.rb
index abc1234..def5678 100644
--- a/lib/vmdb/permission_stores.rb
+++ b/lib/vmdb/permission_stores.rb
@@ -3,10 +3,10 @@ module Vmdb
class PermissionStores
def self.instance
- @instance ||= new(blacklist)
+ @instance ||= new(unsupported)
end
- def self.blacklist
+ def self.unsupported
permission_files.flat_map { |file| YAML.load_file(file) }
end
@@ -16,14 +16,14 @@ .select(&:exist?)
end
- attr_reader :blacklist
+ attr_reader :unsupported
- def initialize(blacklist)
- @blacklist = blacklist
+ def initialize(unsupported)
+ @unsupported = unsupported
end
def can?(permission)
- blacklist.exclude?(permission.to_s)
+ unsupported.exclude?(permission.to_s)
end
def supported_ems_type?(type)
| Rename term to unsupported for clarity
|
diff --git a/lib/hermes.rb b/lib/hermes.rb
index abc1234..def5678 100644
--- a/lib/hermes.rb
+++ b/lib/hermes.rb
@@ -1,6 +1,8 @@ require "hermes/version"
require 'thor'
require 'plist'
+
+require 'hermes/deploy'
module Hermes
@@ -9,15 +11,15 @@ desc "check", "will check if everything necessary for building easily is present"
def check
puts "checking. Missing tools will be installed, if possible."
-
+
end
desc "build JOB", "will build the job"
def build(plist)
- puts "building using the file #{job}"
+ puts "building using the file #{plist}"
- deployments = Plist::parse_xml(plist)
+ deployments = Plist::parse_xml(plist)
deploy deployments
end
| Update the CLI to use a plist as the sole argument
|
diff --git a/topaz_test_case.rb b/topaz_test_case.rb
index abc1234..def5678 100644
--- a/topaz_test_case.rb
+++ b/topaz_test_case.rb
@@ -1,15 +1,21 @@ #!/usr/bin/ruby
-require 'test/unit'
require 'topaz'
require 'stone'
+require 'test/unit'
require 'rake'
include FileUtils
+TEST_STONE_NAME = 'testcase'
+
class TopazTestCase < Test::Unit::TestCase
def setup
- @stone = Stone.existing('topaz_testing')
+ if not GemStone.current.stones.include? TEST_STONE_NAME
+ @stone = Stone.create(TEST_STONE_NAME)
+ else
+ @stone = Stone.existing(TEST_STONE_NAME)
+ end
@stone.start
@topaz = Topaz.new(@stone)
end
| Make testcase just a bit more failproof
|
diff --git a/lesson11/imagine.rb b/lesson11/imagine.rb
index abc1234..def5678 100644
--- a/lesson11/imagine.rb
+++ b/lesson11/imagine.rb
@@ -0,0 +1,12 @@+# Lesson 11 - Rhythm 4 - 'Split Chord'
+# Imagine - The Beatles
+eval(
+ IO.read("#{Dir.home}/ruby/pianoforall/lesson11/split_chord.rb"),
+ binding
+)
+
+use_synth :piano
+
+split_chord_c4(split_reps: 1)
+split_chord_c4(split_reps: 1, chord_name: :major7)
+split_chord_f4
| Add Imagine and finish off Lesson 11
|
diff --git a/valid.gemspec b/valid.gemspec
index abc1234..def5678 100644
--- a/valid.gemspec
+++ b/valid.gemspec
@@ -3,11 +3,11 @@
Gem::Specification.new do |s|
s.name = 'valid'
- s.version = '0.1.1'
+ s.version = '0.1.2'
s.authors = ['Jeremy Bush']
s.email = ['contractfrombelow@gmail.com']
s.summary = 'A standalone, generic object validator for ruby'
- s.homepage = %q{https://github.com/zombor/validation}
+ s.homepage = %q{https://github.com/zombor/Validator}
s.files = Dir['lib/**/*.rb']
s.require_path = 'lib'
| Add proper homepage in gemspec
|
diff --git a/lib/gds_api/base.rb b/lib/gds_api/base.rb
index abc1234..def5678 100644
--- a/lib/gds_api/base.rb
+++ b/lib/gds_api/base.rb
@@ -21,7 +21,7 @@ :post_json, :post_json!,
:put_json, :put_json!,
:delete_json!,
- :get_raw
+ :get_raw, :post_multipart
attr_reader :options
| Add post_multipart to the delegated methods list |
diff --git a/lib/hightops/cli.rb b/lib/hightops/cli.rb
index abc1234..def5678 100644
--- a/lib/hightops/cli.rb
+++ b/lib/hightops/cli.rb
@@ -15,6 +15,13 @@ load_environment
setup
start_runner(workers)
+ end
+
+ desc 'bootstrap FirstWorker,SecondWorker, ... ,NthWorker', 'Bootstrap workers'
+ def bootstrap(workers)
+ load_environment
+ setup
+ bootstrap_worker(workers)
end
private
@@ -43,5 +50,16 @@
Sneakers::Runner.new(workers).run
end
+
+ def bootstrap_worker(workers)
+ workers, missing_workers = Sneakers::Utils.parse_workers(workers)
+
+ raise WorkerNotFound unless missing_workers.empty?
+ raise NoWorkers if workers.empty?
+
+ workers.each do |worker|
+ worker.new.setup_retrier
+ end
+ end
end
end
| Add bootstrap task for CLI
|
diff --git a/level_1/short_circuit_evaluation/game.rb b/level_1/short_circuit_evaluation/game.rb
index abc1234..def5678 100644
--- a/level_1/short_circuit_evaluation/game.rb
+++ b/level_1/short_circuit_evaluation/game.rb
@@ -0,0 +1,15 @@+# Short-Circuit Evaluation
+# Using Short-Circuit Evaluation can clean up your code a great deal.
+# Update the following method to use short circuit evaluation. While you're at it, why not try reducing the entire method to one line?
+def search_index(games, search_term)
+ search_index = games.find_index(search_term)
+
+ if search_index
+ search_index
+ else
+ "Not Found"
+ end
+end
+
+games = ["Super Mario Bros.", "Contra", "Metroid", "Mega Man 2"]
+puts search_index(games, "Contra")
| Add new problem to be solved using short circuit evaluations
|
diff --git a/lib/rack_tracker.rb b/lib/rack_tracker.rb
index abc1234..def5678 100644
--- a/lib/rack_tracker.rb
+++ b/lib/rack_tracker.rb
@@ -17,7 +17,7 @@
def self.plugins
included_plugins.collect do |plugin|
- plugin.to_s.split('::').last.downcase
+ plugin.to_s.split('::').last.underscore
end
end
| Make sure that plugins lists doesn't mangle plugin names
|
diff --git a/lib/samuel/drivers/net_http_log_entry.rb b/lib/samuel/drivers/net_http_log_entry.rb
index abc1234..def5678 100644
--- a/lib/samuel/drivers/net_http_log_entry.rb
+++ b/lib/samuel/drivers/net_http_log_entry.rb
@@ -34,8 +34,9 @@ end
def error?
- error_classes = [Exception, Net::HTTPClientError, Net::HTTPServerError]
- error_classes.any? { |c| @response.is_a?(c) }
+ error_classes = %w(Exception Net::HTTPClientError Net::HTTPServerError)
+ response_ancestors = @response.class.ancestors.map { |a| a.to_s }
+ (error_classes & response_ancestors).any?
end
end
| Check classes using strings, so this file can be safely required when Net::HTTP isn't loaded
|
diff --git a/lib/subway/utils.rb b/lib/subway/utils.rb
index abc1234..def5678 100644
--- a/lib/subway/utils.rb
+++ b/lib/subway/utils.rb
@@ -1,7 +1,9 @@ module Subway
module Utils
- def self.require_pattern(root, pattern)
+ extend self
+
+ def require_pattern(root, pattern)
Dir[root.join(pattern)].sort.each { |file| require file }
end
| Support including/extending the Utils module
|
diff --git a/config/initializers/settings.rb b/config/initializers/settings.rb
index abc1234..def5678 100644
--- a/config/initializers/settings.rb
+++ b/config/initializers/settings.rb
@@ -6,7 +6,7 @@ include Singleton
class << self
- def respond_to?(method, include_private = false)
+ def respond_to?(method, include_private: false)
super or instance.respond_to?(method, include_private)
end
@@ -23,7 +23,7 @@ @settings = YAML.load(eval(ERB.new(File.read(filename)).src, nil, filename))
end
- def respond_to?(method, include_private = false)
+ def respond_to?(method, include_private: false)
super or is_settings_query_method?(method) or @settings.key?(setting_key_for(method))
end
| Use keyword arguments for boolean with default value
|
diff --git a/modules/users/spec/classes/users_spec.rb b/modules/users/spec/classes/users_spec.rb
index abc1234..def5678 100644
--- a/modules/users/spec/classes/users_spec.rb
+++ b/modules/users/spec/classes/users_spec.rb
@@ -0,0 +1,21 @@+require_relative '../../../../spec_helper'
+
+# get the list of groups
+def class_list
+ if ENV["classes"]
+ ENV["classes"].split(",")
+ else
+ class_dir = File.expand_path("../../../manifests/groups", __FILE__)
+ Dir.glob("#{class_dir}/*.pp").collect { |dir|
+ dir.gsub(/^#{class_dir}\/(.+)\.pp$/, 'users::groups::\1')
+ }
+ end
+end
+
+# this will throw a parse error if a user's manifest has been removed
+# but they are still being included in a group
+class_list.each do |group_class|
+ describe group_class, :type => :class do
+ it { should contain_class(group_class) }
+ end
+end
| Test that all included users have manifests
This is to make the task of removing users who have left easier. Instead of
having ensure absent, we should just remove their manifest and remove it from
any groups that include them.
|
diff --git a/queue/broadcaster.rb b/queue/broadcaster.rb
index abc1234..def5678 100644
--- a/queue/broadcaster.rb
+++ b/queue/broadcaster.rb
@@ -2,7 +2,7 @@ require_relative 'lib/file-queue'
require 'ezmq'
-publisher = EZMQ::Publisher.new port: 5557#, topic: 'busy-queues'
+publisher = EZMQ::Publisher.new port: 5557
queues = {}
%w(raw-payload parsed-payload jobs testing).each do |queue|
queues[queue] = FileQueue.new queue
| Comment removed, no longer supported by ezmq
|
diff --git a/maruku_gem.rb b/maruku_gem.rb
index abc1234..def5678 100644
--- a/maruku_gem.rb
+++ b/maruku_gem.rb
@@ -11,8 +11,8 @@ }
s.files = Dir['lib/**/*.rb'] + Dir['lib/*.rb'] +
Dir['docs/*.md'] + Dir['docs/*.html'] +
- Dir['tests/**/*.md'] +
- Dir['bin/*'] + Dir['*.sh'] + ['Rakefile', 'maruku_gem.rb']
+ Dir['spec/**/*.rb'] + Dir['spec/**/*.md'] +
+ Dir['bin/*'] + ['Rakefile', 'maruku_gem.rb']
s.bindir = 'bin'
s.executables = ['maruku','marutex']
| Include the spec files in the gem.
|
diff --git a/mastermind.rb b/mastermind.rb
index abc1234..def5678 100644
--- a/mastermind.rb
+++ b/mastermind.rb
@@ -1,29 +1,49 @@ #Create a Game class
class Game
#Initialize a new game by setting up a board containing a random code
+
def initialize
- protected
@code = ""
4.times {@code += rand(6).to_s}
end
#Create a play method to start the game
- def play
- puts "The computer has generated a secret code. Please enter your first guess."
+public
+def play
+ puts "The computer has generated a secret code."
player = Player.new
- self.check_guess(player.guess)
+ 12.times do
+ player.guess
+ if check_guess(@guessed_code)
+ break
+ end
+ end
end
#Create a method that checks the guess
- def check_guess
+ def check_guess(num)
#If true: Print the random code and congratulate the player
+ if num === @code
+ puts "The code indeed was #{num}. Congratulations!"
#If false: Give feedback on the guess
+ else
+ puts "No such luck."
+ feedback(num, @code)
+ end
+ end
+
+ def feedback(guess, code)
end
end
#Create a Player class
class Player
+ attr_reader :guessed_code
#Create a method for the player to enter a guess
def guess
+ puts "Please enter your guess, consisting of 4 numbers from 0 to 5."
+ @guessed_code = gets.chomp
end
+end
-end+game = Game.new
+game.play | Set up check_guess and feedback methods
|
diff --git a/money.gemspec b/money.gemspec
index abc1234..def5678 100644
--- a/money.gemspec
+++ b/money.gemspec
@@ -18,7 +18,7 @@ s.add_development_dependency("rspec", "~> 3.2")
s.add_development_dependency("database_cleaner", "~> 1.6")
s.add_development_dependency("sqlite3", "~> 1.3.6")
- s.add_development_dependency("bigdecimal", "~> 1.3.2")
+ s.add_development_dependency("bigdecimal", "~> 1.4.4")
s.files = `git ls-files`.split($/)
s.executables = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
| Use bigdecimal 1.4.x since 1.3.x is unsupported on 2.6
|
diff --git a/event_store-client-http.gemspec b/event_store-client-http.gemspec
index abc1234..def5678 100644
--- a/event_store-client-http.gemspec
+++ b/event_store-client-http.gemspec
@@ -1,7 +1,7 @@ # -*- encoding: utf-8 -*-
Gem::Specification.new do |s|
s.name = 'event_store-client-http'
- s.version = '0.1.1.0'
+ s.version = '0.1.1.1'
s.summary = 'HTTP Client for EventStore'
s.description = ' '
| Package version is increased from 0.1.1.0 to 0.1.1.1
|
diff --git a/AFNetworking-Synchronous.podspec b/AFNetworking-Synchronous.podspec
index abc1234..def5678 100644
--- a/AFNetworking-Synchronous.podspec
+++ b/AFNetworking-Synchronous.podspec
@@ -10,7 +10,7 @@ s.license = 'MIT'
s.author = { "Paul Melnikow" => "github@paulmelnikow.com" }
s.source = { :git => 'https://github.com/paulmelnikow/AFNetworking-Synchronous.git',
- :tag => "v#{s.version}" }
+ :tag => "#{s.version}" }
s.ios.deployment_target = '6.0'
s.requires_arc = true
| Podspec: Use modern version tag (without v)
|
diff --git a/Coordinator.podspec b/Coordinator.podspec
index abc1234..def5678 100644
--- a/Coordinator.podspec
+++ b/Coordinator.podspec
@@ -7,6 +7,8 @@ s.license = { :type => "MIT", :file => "LICENSE" }
s.author = { 'Aleksandar Vacić' => 'radianttap.com' }
s.social_media_url = "https://twitter.com/radiantav"
+ s.ios.deployment_target = "9.0"
+ s.tvos.deployment_target = "10.0"
s.source = { :git => "https://github.com/radianttap/Coordinator.git" }
s.source_files = 'Coordinator/*.swift'
s.frameworks = 'UIKit'
| Bring back damn deployment targets
|
diff --git a/resources/profile.rb b/resources/profile.rb
index abc1234..def5678 100644
--- a/resources/profile.rb
+++ b/resources/profile.rb
@@ -1,11 +1,38 @@+# encoding: UTF-8
+#
+# Cookbook Name:: system
+# Resource:: profile
+#
+# Copyright 2012-2015, Chris Fordham
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
actions [:configure]
default_action :configure
-attribute :filename, name_attribute: true, kind_of: String, default: '/etc/profile'
+attribute :filename,
+ name_attribute: true,
+ kind_of: String,
+ default: '/etc/profile'
-attribute :template, kind_of: Hash, default: nil
+attribute :template,
+ kind_of: Hash,
+ default: nil
-attribute :path, kind_of: Array, default: []
+attribute :path,
+ kind_of: Array,
+ default: []
-attribute :append_scripts, kind_of: Array, default: []
+attribute :append_scripts,
+ kind_of: Array,
+ default: []
| Add comment header and indent attribute definition params.
|
diff --git a/Casks/eagle.rb b/Casks/eagle.rb
index abc1234..def5678 100644
--- a/Casks/eagle.rb
+++ b/Casks/eagle.rb
@@ -1,6 +1,6 @@ cask :v1 => 'eagle' do
- version '7.1.0'
- sha256 '95a721bae751ea210fad390c9b414ec5e317332133072f08247b552e125ab2d5'
+ version '7.2.0'
+ sha256 '9cae311072d8be5a16631ce08d9e0653bdc21e336cc90df2463d7df35521ff2a'
url "ftp://ftp.cadsoft.de/eagle/program/#{version.gsub(/\.\d$/, '')}/eagle-mac-#{version}.zip"
homepage 'http://www.cadsoftusa.com/'
| Update Cadsoft Eagle.app to 7.2.0
|
diff --git a/Casks/franz.rb b/Casks/franz.rb
index abc1234..def5678 100644
--- a/Casks/franz.rb
+++ b/Casks/franz.rb
@@ -2,6 +2,7 @@ version '3.1.0'
sha256 '1789fb44c47fd25db123c8ad6142e24007901fa07a8494263c312dbab7708eb9'
+ # github.com/imprecision/franz-app was verified as official when first introduced to the cask
url "https://github.com/imprecision/franz-app/releases/download/#{version}/Franz-darwin-x64-#{version}.dmg"
appcast 'https://github.com/imprecision/franz-app/releases.atom',
checkpoint: '481bc974abafc69025c5907056373df7a8e5f795544a7a1949e58c3e5858de1b'
| Fix `url` stanza comment for Franz.
|
diff --git a/rspec-virtus.gemspec b/rspec-virtus.gemspec
index abc1234..def5678 100644
--- a/rspec-virtus.gemspec
+++ b/rspec-virtus.gemspec
@@ -19,4 +19,6 @@
gem.add_dependency "rspec", "~> 2.13"
gem.add_dependency "virtus", "~> 0.5"
+
+ gem.add_development_dependency "rake", "~> 10.0.0"
end
| Add Rake as a development dependency
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.