Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: kanetann/dotfiles
base: f706856d93
...
head fork: kanetann/dotfiles
compare: 28134e71f8
Checking mergeability… Don't worry, you can still create the pull request.
  • 5 commits
  • 6 files changed
  • 0 commit comments
  • 1 contributor
View
3  .ssh/config
@@ -4,3 +4,6 @@ ServerAliveInterval 60
#ControlMaster auto
#ControlPath /tmp/%r@%h:%p
+Host github.com
+ Compression yes
+ Ciphers arcfour256
View
2  .tmux.conf
@@ -73,7 +73,7 @@ bind C-] run '~/dotfiles/tmux-powerline/mute_statusbar.sh right' # Mute righ
# reattach-to-user-namespace
set-option -g default-command "reattach-to-user-namespace -l zsh"
bind C-q run-shell 'reattach-to-user-namespace ~/dotfiles/bin/tmux-pbcopy'
-bind k kill-session
+bind C-b kill-session
bind-key C-i switch-client -n
View
9 .vimrc
@@ -39,6 +39,7 @@ NeoBundle 'git://github.com/vim-scripts/Align.git'
NeoBundle 'git://github.com/vim-scripts/YankRing.vim'
NeoBundle 'git://github.com/vim-scripts/tComment'
NeoBundle 'git://github.com/vim-scripts/wombat256.vim'
+NeoBundle 'git://github.com/t9md/vim-unite-ack.git'
filetype plugin indent on
@@ -203,6 +204,7 @@ nnoremap <silent> <Space>ul :<C-u>Unite line<CR>
nnoremap <silent> <Space>uc :<C-u>Unite -auto-preview colorscheme<CR>
nnoremap <silent> <Space>ug :<C-u>Unite grep:**/*:-iRHn:<CR>
nnoremap <silent> <Space>us :<C-u>Unite snippet<CR>
+nnoremap <silent> <Space>ua :<C-u>Unite -no-quit ack<CR>
nnoremap <ESC><ESC> :nohlsearch<CR>
nnoremap <C-C><C-C> :nohlsearch<CR>
@@ -357,3 +359,10 @@ let g:unite_source_ruby_require_ruby_command = '$HOME/.rbenv/shims/ruby'
" vim-slime
let g:slime_target = "tmux"
let g:slime_paste_file = "$HOME/.slime_paste"
+
+" unite ack
+if OSTYPE == "Darwin\n"
+ let g:unite_source_ack_command = 'ack --nocolor --no-group'
+endif
+
+
View
2  rails/.rspec
@@ -0,0 +1,2 @@
+--colour
+--drb
View
62 rails/spec/spec_helper.rb
@@ -0,0 +1,62 @@
+require 'rubygems'
+require 'spork'
+#uncomment the following line to use spork with the debugger
+#require 'spork/ext/ruby-debug'
+
+Spork.prefork do
+ # Loading more in this block will cause your tests to run faster. However,
+ # if you change any configuration or code from libraries loaded here, you'll
+ # need to restart spork for it take effect.
+
+ # This file is copied to spec/ when you run 'rails generate rspec:install'
+ ENV["RAILS_ENV"] ||= 'test'
+ require File.expand_path("../../config/environment", __FILE__)
+ require 'rspec/rails'
+ require 'rspec/autorun'
+
+ # Requires supporting ruby files with custom matchers and macros, etc,
+ # in spec/support/ and its subdirectories.
+ Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
+
+ RSpec.configure do |config|
+ # ## Mock Framework
+ #
+ # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
+ #
+ # config.mock_with :mocha
+ # config.mock_with :flexmock
+ # config.mock_with :rr
+
+ # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
+ config.fixture_path = "#{::Rails.root}/spec/fixtures"
+
+ # If you're not using ActiveRecord, or you'd prefer not to run each of your
+ # examples within a transaction, remove the following line or assign false
+ # instead of true.
+ config.use_transactional_fixtures = true
+
+ # If true, the base class of anonymous controllers will be inferred
+ # automatically. This will be the default behavior in future versions of
+ # rspec-rails.
+ config.infer_base_class_for_anonymous_controllers = false
+
+ config.before(:suite) do
+ DatabaseCleaner.strategy = :truncation
+ DatabaseCleaner.clean_with(:truncation)
+ end
+
+ config.before(:each) do
+ DatabaseCleaner.start
+ end
+
+ config.after(:each) do
+ DatabaseCleaner.clean
+ end
+
+ end
+end
+
+Spork.each_run do
+ # This code will be run each time you run your specs.
+ FactoryGirl.reload
+end
View
83 rails/template.rb
@@ -0,0 +1,83 @@
+# rails application template
+# rails-templates/facebook.rb at master · jm/rails-templates · GitHub <https://github.com/jm/rails-templates/blob/master/facebook.rb>
+# Ruby on Rails Guides: Rails Application Templates <http://edgeguides.rubyonrails.org/rails_application_templates.html>
+
+run "rm public/index.html"
+environment '
+config.generators do |g|
+ g.fixture_replacement :factory_girl
+end
+'
+
+
+gem 'devise'
+gem 'cancan'
+gem 'twitter-bootstrap-rails'
+gem 'unicorn'
+gem 'formtastic'
+gem 'kaminari'
+gem 'resque'
+
+gem_group :development, :test do
+ # testing framework
+ gem 'rspec-rails'
+ gem 'capybara'
+
+ # fixture
+ gem 'factory_girl_rails'
+ gem 'database_cleaner'
+
+ # client notify
+ gem 'growl'
+
+ # coverage
+ gem 'simplecov'
+
+ # pry
+ gem 'pry'
+ gem 'pry-doc'
+ gem 'pry-debugger' # binding.pry
+ gem 'pry-rails'
+
+ # deploy
+ gem 'capistrano'
+ gem 'capistrano-ext'
+ gem 'capistrano_colors'
+
+ # browser debug
+ gem 'better_errors'
+ gem 'binding_of_caller'
+
+ # useful gems
+ gem 'spork'
+ gem 'guard'
+ gem 'guard-bundler'
+ gem 'guard-rspec'
+ gem 'guard-spork'
+ gem 'guard-rails'
+ gem 'guard-livereload'
+ gem 'rb-fsevent'
+ gem 'rails-clean-logs'
+ gem 'awesome_print'
+end
+
+run "bundle install"
+
+run "rails g rspec:install"
+run "guard init rspec"
+run "bundle exec spork --bootstrap"
+
+run "cp ~/dotfiles/rails/.rspec .rspec"
+run "cp ~/dotfiles/rails/spec/spec_helper.rb spec/spec_helper.rb"
+
+# device
+run "rails g devise:install"
+
+# scaffold
+generate(:scaffold, "article title:string content:text")
+route "root to: 'articles#index'"
+
+# database
+run "rake db:migrate"
+
+generate("factory_girl:model", "article title:string content:text")

No commit comments for this range

Something went wrong with that request. Please try again.