chrismealy

Squashing Git Commits

The easy and flexible way

This method avoids merge conflicts if you have periodically pulled master into your branch. It also gives you the opportunity to squash into more than 1 commit, or to re-arrange your code into completely different commits (e.g. if you ended up working on three different features but the commits were not consecutive).

Note: You cannot use this method if you intend to open a pull request to merge your feature branch. This method requires committing directly to master.

Switch to the master branch and make sure you are up to date:

chrismealy

# See http://jordan.broughs.net/archives/2012/07/enumerablecount_by-for-ruby

# Ruby >= 1.8.7 (incl 1.9.x)

module Enumerable
  def count_by(&block)
    Hash[group_by(&block).map { |key,vals| [key, vals.size] }]
  end
end

chrismealy

javascript:(function(){var newSS, styles='* { background:white ! important; color: black !important; text-decoration: none !important } :link, :link * { color: #0000EE !important } :visited, :visited * { color: #551A8B !important }'; if(document.createStyleSheet) { document.createStyleSheet("javascript:'"+styles+"'"); } else { newSS=document.createElement('link'); newSS.rel='stylesheet'; newSS.href='data:text/css,'+escape(styles); document.getElementsByTagName("head")[0].appendChild(newSS); } })();

chrismealy

source :rubygems

# We are not loading Active Record, nor Active Resources etc.
# We can do this in any app by simply replacing the rails gem
# by the parts we want to use.
gem "actionpack", "~> 3.2"
gem "railties",   "~> 3.2"
gem "tzinfo"

# Let's use thin

chrismealy

module RequestDebugHelpers

  DEBUG_URL = "http://example.dev/debug.html"

  def show_page
    filename = File.join(Rails.root, 'public', 'debug.html')
    File.open(filename, 'w') do |f|
      f.puts page.body.gsub("</title>", " (#{ current_path })\\0")
    end
    system "osascript", "-e", <<-OSASCRIPT

chrismealy

module Resque
  module AsyncJob
    @@_queue= :default
    def self.included(base)
      base.extend(ClassMethods)
    end
  
    module ClassMethods
      # Set the default queue. chain method
      def queue(new_queue = nil)

chrismealy

# -*- encoding : utf-8 -*-
module AsyncResque
  extend ActiveSupport::Concern

  included do
    include Sidekiq::Worker
    def perform(*args)
      self.class.find(args.first).send(args.last)
    end
  end

chrismealy

find . -mindepth 1 -maxdepth 1 -type d -print0 |xargs -0 -I {}  zip -r "{}.zip" "{}"

chrismealy

.ui-autocomplete {
  position: absolute;
  top: 100%;
  left: 0;
  z-index: 1000;
  float: left;
  display: none;
  min-width: 160px;
  _width: 160px;
  padding: 4px 0;

chrismealy

require 'feedzirra'
require 'typhoeus'

f = Feedzirra::Feed.fetch_and_parse('http://krugman.blogs.nytimes.com/feed/')
urls = f.entries.map &:url
h = Typhoeus::Hydra.new
urls.map do |url| 
  r = Typhoeus::Request.new(url)
  r.on_complete {|rsp| puts rsp.body[400..500] }
  h.queue(r)