fixing merge issues on .gitignore

Author: akitaonrails

.gitignore

@@ -1,7 +1,19 @@
-.DS_Store
 tags
 *~
 *.sw*
 .VimballRecord
 .netrwhist
 bundle/vim-peepopen
+.DS_Store
+*.log
+*.tmp
+*.swp
+*.old
+*.bkp
+*.zip
+*.rar
+*.arj
+*.[t]gz
+*.[t]bz2
+tmp/
+log/

Rakefile

@@ -0,0 +1,76 @@
+#require 'fileutils'
+#include FileUtils
+require 'rake'
+ 
+# The install task was stolen from RyanB
+# http://github.com/ryanb/dotfiles
+
+desc "install the snippets into user's vim directory @home"
+task :install => ["snippets_dir:find"] do
+  replace_all = false
+  Dir['*'].each do |file|
+    next if %w[Rakefile].include? file
+    
+    if File.exist?(File.join(@snippets_dir, "#{file}"))
+      if replace_all
+        replace_file(file)
+      else
+        print "overwrite #{File.join(@snippets_dir, file)}? [ynaq] "
+        case $stdin.gets.chomp
+        when 'a'
+          replace_all = true
+          replace_file(file)
+        when 'y'
+          replace_file(file)
+        when 'q'
+          exit
+        else
+          puts	File.join(@snippets_dir, "#{file}") 
+        end
+      end
+    else
+      link_file(file)
+    end
+  end
+end
+ 
+def replace_file(file)
+  link_file(file)
+end
+ 
+def link_file(file)
+  puts "linking #{path_to(file)}"
+  ln_s File.join(FileUtils.pwd,file), path_to(file), :force => true
+end
+
+def path_to(file)
+	File.join(@snippets_dir, "#{file}")
+end
+
+
+namespace :snippets_dir do
+	desc "Sets @snippets_dir dependent on which OS You run" 
+  task :find do
+    @snippets_dir = File.join(ENV['VIMFILES'] || ENV['HOME'] || ENV['USERPROFILE'], RUBY_PLATFORM =~ /mswin32/ ? "vimfiles" : ".vim", "snippets")
+  end
+
+  desc "Purge the contents of the vim snippets directory"
+  task :purge => ["snippets_dir:find"] do
+    rm_rf @snippets_dir, :verbose => true if File.directory? @snippets_dir
+    mkdir @snippets_dir, :verbose => true
+  end
+end
+
+desc "Copy the snippets directories into ~/.vim/snippets"
+task :deploy_local => ["snippets_dir:purge"] do
+  Dir.foreach(".") do |f|
+    cp_r f, @snippets_dir, :verbose => true if File.directory?(f) && f =~ /^[^\.]/
+  end
+  cp "support_functions.vim", @snippets_dir, :verbose => true
+end
+
+desc "Alias for purge"
+task :purge => ["snippets_dir:purge"]
+
+desc "Alias for default task run easy 'rake'"
+task :default => :install

_/date/date + time.snippet

@@ -0,0 +1 @@
+`strftime("%Y-%m-%d %H:%M:%S")`

_/date/date.snippet

@@ -0,0 +1 @@
+`strftime("%Y-%m-%d")`

_/fold.snippet

@@ -0,0 +1,3 @@
+# {{{ ${1:description}
+${2}
+# }}}

_/lorem.snippet

@@ -0,0 +1,4 @@
+Lorem ipsum dolor sit amet, consectetur magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation
+ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate
+velit esse cillum dolore eu fugiat nulla pariatur.  Excepteur sint occaecat cupidatat non proident, sunt in
+culpa qui officia deserunt mollit anim id est laborum${1}

_/modeline.snippet

@@ -0,0 +1 @@
+`Snippet_Modeline()`

c/cl.snippet

@@ -0,0 +1,7 @@
+class ${1:`Filename('$1_t', 'name')`} {
+	public:
+		$1 (${2:arguments});
+		virtual ~$1 ();
+	private:
+		${3:/* data */}
+};

c/def.snippet

@@ -0,0 +1,3 @@
+#ifndef $1
+#define ${1:SYMBOL} ${2:value}
+#endif${3}

c/do.snippet

@@ -0,0 +1,3 @@
+do {
+	${2:/* code */}
+} while (${1:/* condition */});

c/el.snippet

@@ -0,0 +1,3 @@
+else {
+	${1}
+}

c/for.snippet

@@ -0,0 +1,3 @@
+for (${2:i} = 0; $2 < ${1:count}; $2${3:++}) {
+	${4:/* code */}
+}

c/forr.snippet

@@ -0,0 +1,3 @@
+for (${1:i} = 0; ${2:$1 < 5}; $1${3:++}) {
+	${4:/* code */}
+}

c/fpf.snippet

@@ -0,0 +1 @@
+fprintf(${1:stderr}, "${2:%s}\n"${3});${4}

c/fun.snippet

@@ -0,0 +1,4 @@
+${1:void} ${2:function_name} (${3})
+{
+	${4:/* code */}
+}

c/if.snippet

@@ -0,0 +1,3 @@
+if (${1:/* condition */}) {
+	${2:/* code */}
+}

c/inc/inc.snippet

@@ -0,0 +1 @@
+#include "${1:`Filename("$1.h")`}"${2}

c/inc/inc_global.snippet

@@ -0,0 +1 @@
+#include <${1:stdio}.h>${2}

c/main.snippet

@@ -0,0 +1,5 @@
+int main (int argc, char const* argv[])
+{
+	${1:/* code */}
+	return 0;
+}

c/map.snippet

@@ -0,0 +1 @@
+std::map<${1:key}, ${2:value}> map${3};

c/ns.snippet

@@ -0,0 +1,3 @@
+namespace ${1:`Filename('', 'my')`} {
+	${2}
+} /* $1 */

c/once.snippet

@@ -0,0 +1,6 @@
+#ifndef ${1:`toupper(Filename('', 'UNTITLED').'_'.system("/usr/bin/ruby -e 'print (rand * 2821109907455).round.to_s(36)'"))`}
+#define $1
+
+${2}
+
+#endif /* end of include guard: $1 */

c/pr.snippet

@@ -0,0 +1 @@
+printf("${1:%s}\n"${2});${3}

c/readfile.snippet

@@ -0,0 +1,7 @@
+std::vector<char> v;
+if (FILE *${2:fp} = fopen(${1:"filename"}, "r")) {
+	char buf[1024];
+	while (size_t len = fread(buf, 1, sizeof(buf), $2))
+		v.insert(v.end(), buf, buf + len);
+	fclose($2);
+}${3}

c/st.snippet

@@ -0,0 +1,3 @@
+struct ${1:`Filename('$1_t', 'name')`} {
+	${2:/* data */}
+}${3: /* optional variable list */};${4}

c/t.snippet

@@ -0,0 +1 @@
+${1:/* condition */} ? ${2:a} : ${3:b}'

c/td.snippet

@@ -0,0 +1 @@
+typedef ${1:int} ${2:MyCustomType};

c/tds.snippet

@@ -0,0 +1,3 @@
+typedef struct {
+	${2:/* data */}
+} ${1:`Filename('$1_t', 'name')`};

c/vector.snippet

@@ -0,0 +1 @@
+std::vector<${1:char}> v${2};

c/wh.snippet

@@ -0,0 +1,3 @@
+while (${1:/* condition */}) {
+	${2:/* code */}
+}

css/!.snippet

@@ -0,0 +1 @@
+!important

css/#.snippet

@@ -0,0 +1,3 @@
+#${1:id} {
+  ${2}
+}

css/cl.snippet

@@ -0,0 +1,3 @@
+.${1:class} {
+  ${2:color: pink;}
+}

css/tag.snippet

@@ -0,0 +1,3 @@
+${1:tag} {
+  ${2:color: pink;}
+}

css/url.snippet

@@ -0,0 +1 @@
+url('${1:../images/}${2}')${3}

cucumber/a.snippet

@@ -0,0 +1 @@
+And 

cucumber/b.snippet

@@ -0,0 +1,2 @@
+Background:
+  ${1}

cucumber/e.snippet

@@ -0,0 +1,2 @@
+Examples:
+  

cucumber/f.snippet

@@ -0,0 +1,2 @@
+Feature: ${1:name}
+	${2}

cucumber/feat.snippet

@@ -0,0 +1,5 @@
+Feature: ${1:[feature name eg. "Manage some thing ..."]}
+	In order to ${2:[goal]}
+	As a ${3:[stakeholder]}
+	I want ${4:[behavior]}
+

cucumber/feature.snippet

@@ -0,0 +1,5 @@
+Feature: ${1:[feature name eg. "Manage some thing ..."]}
+	In order to ${2:[goal]}
+	As a ${3:[stakeholder]}
+	I want ${4:[behavior]}
+

cucumber/g.snippet

@@ -0,0 +1 @@
+Given 

cucumber/s.snippet

@@ -0,0 +1 @@
+Scenario: 

cucumber/scen/scenario_with_js.snippet

@@ -0,0 +1,3 @@
+@culerity
+Scenario: ${1:Delete customers}
+	${2:Given the following customers:}

cucumber/scen/scenario_without_js.snippet

@@ -0,0 +1,3 @@
+Scenario: ${1:Register new customers}
+	${2:Given I am on the new customers page
+	And I press "Create"}

cucumber/so.snippet

@@ -0,0 +1 @@
+Scenario Outline: 

cucumber/steps

@@ -0,0 +1,25 @@
+    Given I am on [page_name]
+  
+    When I go to [page_name]
+    When I press "[button]"
+    When I follow "[link]"
+    When I fill in "[field]" with "[value]"
+    When I select "[value]" from "[field]"
+    When I select "[time]" as the date and time
+    When I select "[datetime]" as the "[datetime_label]" date and time
+    When I select "[time]" as the time
+    When I select "[time]" as the "[time_label]" time
+    When I select "[date]" as the date
+    When I select "[date]" as the "[date_label]" date
+    When I check "[field]"
+    When I uncheck "[field]"
+    When I choose "[field]"
+    When I attach the file at "[path]" to "[field]"
+  
+    Then I should see "[text]"
+    Then I should not see "[text]"
+    Then the "[field]" field should contain "[value]"
+    Then the "[field]" field should not contain "[value]"
+    Then the "[label]" checkbox should be checked
+    Then I should be on [page_name]
+

cucumber/t.snippet

@@ -0,0 +1 @@
+Then 

cucumber/w.snippet

@@ -0,0 +1 @@
+When 

eruby-rails/conf.snippet

@@ -0,0 +1,3 @@
+<% content_for :${1:yield_label_in_layout} do %>
+  ${2}
+<% end %>

eruby-rails/cs.snippet

@@ -0,0 +1 @@
+<%= collection_select ${1:object}, ${2:method}, ${3:collection}, ${4:value_method}, ${5:text_method}${6:, options} %>${7}

eruby-rails/ct.snippet

@@ -0,0 +1 @@
+<%= content_tag '${1:DIV}', ${2:content}${3:, options} %>

eruby-rails/ff.snippet

@@ -0,0 +1,3 @@
+<%= form_for @${1:model} do |f| %>
+  ${2}
+<% end %>

eruby-rails/ffcb.snippet

@@ -0,0 +1 @@
+<%= ${1:f}.check_box :${2:attribute} %>

eruby-rails/ffe.snippet

@@ -0,0 +1,4 @@
+<%= form_for @${2:model} do |f| %>
+  <%= f.error_messages %>
+  ${3}
+<% end %>

eruby-rails/ffff.snippet

@@ -0,0 +1 @@
+<%= ${1:f}.file_field :${2:attribute} %>

eruby-rails/ffhf.snippet

@@ -0,0 +1 @@
+<%= ${1:f}.hidden_field :${2:attribute} %>

eruby-rails/ffl.snippet

@@ -0,0 +1 @@
+<%= ${1:f}.label :${2:attribute}, '${3:$2}' %>

eruby-rails/ffpf.snippet

@@ -0,0 +1 @@
+<%= ${1:f}.password_field :${2:attribute} %>

eruby-rails/ffrb.snippet

@@ -0,0 +1 @@
+<%= ${1:f}.radio_button :${2:attribute}, :${3:tag_value} %>

eruby-rails/ffs.snippet

@@ -0,0 +1 @@
+<%= ${1:f}.submit "${2:submit}" %>

eruby-rails/ffta.snippet

@@ -0,0 +1 @@
+<%= ${1:f}.text_area :${2:attribute} %>

eruby-rails/fftf.snippet

@@ -0,0 +1 @@
+<%= ${1:f}.text_field :${2:attribute} %>

eruby-rails/fields.snippet

@@ -0,0 +1,3 @@
+<% fields_for :${1:model}, @$1 do |${2:f}| %>
+  ${3}
+<% end %>

eruby-rails/for.snippet

@@ -0,0 +1,3 @@
+<% for ${2:item} in ${1:list} %>
+  ${3}
+<% end %>

eruby-rails/ft.snippet

@@ -0,0 +1,3 @@
+<%= form_tag(${1:'url'}) do %>
+  ${2}
+<% end %>

eruby-rails/i18.snippet

@@ -0,0 +1 @@
+I18n.t('${1:type.key}')${2}

eruby-rails/it.snippet

@@ -0,0 +1 @@
+<%= image_tag "${1}"${2} %>

eruby-rails/jit.snippet

@@ -0,0 +1 @@
+<%= javascript_include_tag ${1::all}, :cache => ${2:true} %>

eruby-rails/jsit.snippet

@@ -0,0 +1 @@
+<%= javascript_include_tag "${1}" %>

eruby-rails/lia.snippet

@@ -0,0 +1 @@
+<%= link_to "${1:link text}", :action => "${2:index}" %>

eruby-rails/liai.snippet

@@ -0,0 +1 @@
+<%= link_to "${1:link text}", :action => "${2:edit}", :id => @${3:item} %>

eruby-rails/lic.snippet

@@ -0,0 +1 @@
+<%= link_to "${1:link text}", :controller => "${2:items}" %>

eruby-rails/lica.snippet

@@ -0,0 +1 @@
+<%= link_to "${1:link text}", :controller => "${2:items}", :action => "${3:index}" %>

eruby-rails/licai.snippet

@@ -0,0 +1 @@
+<%= link_to "${1:link text}", :controller => "${2:items}", :action => "${3:edit}", :id => @${4:item} %>

eruby-rails/lim.snippet

@@ -0,0 +1 @@
+<%= link_to ${1:model}.${2:name}, ${3:$1_path($1)} %>

eruby-rails/linp.snippet

@@ -0,0 +1 @@
+<%= link_to "${1:link text}", ${2:parent}_${3:child}_path(@$2, @$3) %>

eruby-rails/linpp.snippet

@@ -0,0 +1 @@
+<%= link_to "${1:link text}", ${2:parent}_${3:child}_path(@$2) %>

eruby-rails/lip.snippet

@@ -0,0 +1 @@
+<%= link_to "${1:link text}", ${2:model}_path(@${3:instance}) %>

eruby-rails/lipp.snippet

@@ -0,0 +1 @@
+<%= link_to "${1:link text}", ${2:model}s_path %>

eruby-rails/lt.snippet

@@ -0,0 +1 @@
+<%= link_to "${1:name}", ${2:dest} %>

eruby-rails/ltr.snippet

@@ -0,0 +1 @@
+<%= link_to_remote "${1:name}", ${2:options} %>

eruby-rails/ofcfs.snippet

@@ -0,0 +1 @@
+<%= options_from_collection_for_select ${1:collection}, ${2:value_method}, ${3:text_method}, ${4:selected_value} %>

eruby-rails/rf.snippet

@@ -0,0 +1 @@
+<%= render :file => "${1:file}"${2} %>

eruby-rails/rp.snippet

@@ -0,0 +1 @@
+<%= render :partial => "${1:file}"${2} %>

eruby-rails/rt.snippet

@@ -0,0 +1 @@
+<%= render :template => "${1:file}"${2} %>

eruby-rails/sbtr.snippet

@@ -0,0 +1 @@
+<%= submit_to_remote ${1:name}, ${2:value} %>

eruby-rails/slt.snippet

@@ -0,0 +1 @@
+<%= stylesheet_link_tag ${1::all}, :cache => ${2:true} %>

eruby-rails/sslt.snippet

@@ -0,0 +1 @@
+<%= stylesheet_link_tag "${1}" %>

eruby-rails/st.snippet

@@ -0,0 +1 @@
+<%= submit_tag "${1:Save changes}" %>

eruby/%.snippet

@@ -0,0 +1 @@
+<% ${1} %>

eruby/%=.snippet

@@ -0,0 +1 @@
+<%= ${1} %>

eruby/e.snippet

@@ -0,0 +1 @@
+<%= ${1} %>

eruby/else.snippet

@@ -0,0 +1 @@
+<% else %>

eruby/end.snippet

@@ -0,0 +1 @@
+<% end %>

eruby/er.snippet

@@ -0,0 +1 @@
+<% ${1} %>

eruby/if.snippet

@@ -0,0 +1,3 @@
+<% if ${1:condition} %>
+  ${2}
+<% end %>