tanjun 0.0.1.alpha3 → 0.0.1.alpha4

data/.gitignore

@@ -15,3 +15,7 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.*.sw[a-z]
+*.un~
+Session.vim
+

data/bin/bootstrap

@@ -1,25 +1,33 @@
 #!/bin/bash
-# This file can be run directly from Github with:
-# curl -L http://bit.ly/tanjun-bootstrap | bash -s
+# This script can be run directly from Github with:
+#   curl -L http://bit.ly/tanjun-bootstrap | bash -s
+#
+# This script installs all rvm/ruby/nginx/passenger dependencies and a few
+# useful applications. It also installs rvm, the latest ruby-mri, the tanjun
+# gem and runs the the tanjun installer.
 
-applications="vim google-chrome-stable git"
-dependencies="build-essential openssl libreadline6 libreadline6-dev "\
-"zlib1g zlib1g-dev libssl-dev libyaml-dev libsqlite3-dev "\
-"sqlite3 libxml2-dev libxslt1-dev autoconf libc6-dev "\
-"libncurses-dev automake libtool bison subversion"
-gems="bundler passenger hub rails"
+apps="vim google-chrome-stable"
+rvm_dep="build-essential openssl libreadline6 libreadline6-dev curl "\
+"git-core zlib1g zlib1g-dev libssl-dev libyaml-dev libsqlite3-dev sqlite3 "\
+"libxml2-dev libxslt-dev autoconf libc6-dev ncurses-dev automake libtool "\
+"bison subversion"
+nginx_dep="libcurl4-openssl-dev"
 
 # Install package repositories
-wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
-sudo sh -c 'echo "deb http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list'
+curl -L https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
+sudo sh -c 'echo "deb http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google.list'
 sudo apt-get update
 
 # Install applications and dependencies
-sudo apt-get install --force-yes --yes $dependencies $applications
+sudo apt-get install --force-yes --yes $dependencies
 
 # Install RVM
 curl -L get.rvm.io | bash -s stable --ruby
-source "$HOME/.rvm/scripts/rvm"
-gem install $gems
-gem install tanjun --pre
+source "$HOME/.bashrc"
+
+# Install and run Tanjun
+gem install tanjun --no-ri --no-rdoc
 tanjun install
+
+echo "Now reload your shell or run:"
+echo "  source ~/.bashrc"

data/bin/tanjun

@@ -1,88 +1,109 @@
 #!/usr/bin/env ruby
-require 'tanjun'
+require 'kwalify'
+require 'hashie'
 
 module Tanjun
-class Tanjun < Thor
-  include Thor::Actions
+  class Tanjun < Thor
+    include Thor::Actions
 
-  def self.source_root
-    @source ||= File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
-  end
+    def self.source_root
+      @source ||= File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
+    end
 
-  desc "install", "installs Tanjun"
-  def install
-    self.destination_root = File.expand_path("~")
+    desc "install", "installs Tanjun"
+    def install
+      self.destination_root = File.expand_path("~")
 
-    ['projects', 'bin'].each do |path|
-      empty_directory path
-    end
+      config = "tanjun.yml"
+      config_root = file_exists?(config) ? destination_root : source_root
+      config = File.join(config_root, config)
 
-    bash_profile = '[[ -s "$HOME/.bashrc" ]] && source "$HOME/.bashrc"'
-    bashrc = '[[ -s "$HOME/.tanjun_profile" ]] && source "$HOME/.tanjun_profile"'
-    bashrc_flag = '[ -z "$PS1" ] && return'
+      @options = Kwalify::Yaml.load(ERB.new(File.read(config)).result)
 
-    add_to_file ".bash_profile", bash_profile
-    if add_to_file ".bashrc", bashrc
-      if add_to_file ".bashrc", 'if [[ -n "$PS1" ]]; then', bashrc_flag, force: true, quiet: true
-        add_to_file ".bashrc", 'fi', nil, force: true, quiet: true
-      end
-    end
+      schema_file = "#{source_root}/tanjun_schema.yml"
+      if File.exists? schema_file
+        schema = Kwalify::Yaml.load_file(schema_file)
+        validator = Kwalify::Validator.new(schema)
+
+        errors = validator.validate(@options)
 
-    path = "#{destination_root}/bin/hub"
-    command = "hub hub standalone > #{path} && chmod 755 #{path}"
-    run_with_conflict_check(path, command)
-
-    path = "/opt/nginx/tanjun"
-    command = "rvmsudo passenger-install-nginx-module --auto --auto-download --prefix=#{path}"
-    run_with_conflict_check(path, command)
-
-    path = "/etc/init.d/nginx"
-    command = "sudo curl -L -o /etc/init.d/nginx http://bit.ly/nginx-ubuntu-init-file && sudo chown root:root /etc/init.d/nginx && sudo chmod '/etc/init.d/nginx' 0755 && sudo update-rc.d nginx defaults"
-    run_with_conflict_check(path, command)
-
-    gitconfig = {
-      name:  { key: 'user.name', prompt: 'Full Name', value: nil },
-      email: { key: 'user.email', prompt: 'Email Address', value: nil },
-      user: { key: 'github.user', prompt: 'Github Username', value: nil },
-      token: { key: 'github.token', prompt: 'Github Token', value: nil },
-      ignore: { key: 'core.excludesfile', value: '~/.gitignore' },
-      color: { key: 'color.gui', value: 'true' }
-    }
-
-    gitconfig.each do |name, setting|
-      setting[:value] ||= run "git config --global #{setting[:key]}", verbose: false, capture: true
-      if setting[:value].to_s.strip.length == 0
-        while setting[:value].to_s.strip.length == 0
-          setting[:value] = ask "#{setting[:prompt]}: "
-          if setting[:value].to_s.strip.length == 0
-            say "Nothing input. Try again"
+        if errors && !errors.empty?
+          say "There were errors in the configuration file. Please correct them."
+          errors.each do |e|
+            say "[#{e.path} #{e.message}]"
           end
+          exit
         end
-        `git config --global #{setting[:key]} #{setting[:value]}`
       end
+
+      @options = @options.to_mash
+
+      @options.each do |method_name, settings|
+        self.send("configure_#{method_name}", settings)
+      end
+
+      bash_profile = '[[ -s "$HOME/.tanjun_profile" ]] && source "$HOME/.tanjun_profile"'
+      add_to_file ".bash_profile", bash_profile
+
+      if file_exists?(".ssh/id_rsa") && file_exists?(".ssh/id_rsa.pub")
+        public_key = File.read("#{destination_root}/.ssh/id_rsa.pub")
+      else unless @options["ssh"]["email"].nil?
+        ask "SSH Passphrase: ", password: true, required: true
+
+        public_key = run "ssh-keygen -t rsa -C '#{@options["ssh"]["email"]}' -f '#{destination_root}/.ssh/id_rsa' -N #{password}"
+      end
+
+      copy_file 'gitignore', '.gitignore'
+      copy_file 'tanjun_profile', '.tanjun_profile'
+
+      say "Now add your ssh public key to https://github.com/settings/ssh:"
+      say public_key
     end
 
-    if file_exists?(".ssh/id_rsa") && file_exists?(".ssh/id_rsa.pub")
-      public_key = File.read("#{destination_root}/.ssh/id_rsa.pub")
-    else
-      password, confirm = nil
-      while password != confirm || password.to_s.strip.length <= 4
-        while password.to_s.strip.length == 0
-          password = ask "SSH Passphrase: "
-          if password.to_s.strip.length <= 4
-            say "Password must be longer than 4 characters"
-          end
+    no_task do
+      def configure_rubies(rubies)
+        rubies.each { |ruby| `rvm install #{ruby}` }
+      end
+
+      def configure_paths(paths)
+        paths.each { |path| empty_directory path }
+      end
+
+      def configure_vundle(vundles)
+        `git clone https://github.com/gmarik/vundle.git ~/vim/bundle/vundle`
+        @vundles = vundles
+        template 'vimrc', '.vimrc'
+      end
+
+      def configure_git(settings)
+        settings.each { |key, value| `git config --global  #{key} #{value}` }
+      end
+
+      def configure_gems(gems)
+        gems.each do |gem|
+          gem.version ||= "=> 0"
+          `rvm do gem install #{gem.name} --version #{gem.version} --no-ri --no-rdoc`
+          self.send("configure_#{gem.name}")
         end
-        confirm = ask "Confirm Passphrase: "
       end
 
-      public_key = run "ssh-keygen -t rsa -C '#{gitconfig[:email][:value]}' -f '#{destination_root}/.ssh/id_rsa' -N #{password}"
-    end
+      def configure_hub
+        path = "#{destination_root}/bin/hub"
+        command = "hub hub standalone > #{path} && chmod 755 #{path}"
+        run_with_conflict_check(path, command)
+      end
+
+      def configure_passenger
+        path = "/opt/nginx/tanjun"
+        command = "rvmsudo passenger-install-nginx-module --auto --auto-download --prefix=#{path}"
+        run_with_conflict_check(path, command)
 
-    copy_file 'gitignore', '.gitignore'
-    copy_file 'tanjun_profile', '.tanjun_profile'
+        path = "/etc/init.d/nginx"
+        command = "sudo curl -L -o /etc/init.d/nginx http://bit.ly/nginx-ubuntu-init-file && sudo chown root:root /etc/init.d/nginx && sudo chmod 0755 '/etc/init.d/nginx' && sudo update-rc.d nginx defaults"
+        run_with_conflict_check(path, command)
+      end
+    end
   end
 end
-end
 
 Tanjun::Tanjun.start

data/bin/templates/tanjun.yml

@@ -0,0 +1,21 @@
+gems:
+ - rails
+ - hub
+ - passenger
+paths:
+ - projects
+ - bin
+vundles:
+ - tpope/vim-fugitive
+ - tpope/vim-rails
+ - LStinson/TagmaBufMgr
+gitconfig:
+  user.name:
+  user.email:
+  github.user:
+  github.token:
+  core.excludesfile: ~/.gitignore
+  color.gui: true
+ssh:
+  email:
+  passphrase:

data/bin/templates/tanjun_profile

@@ -11,8 +11,4 @@ function ps1_git() {
 
 PS1="\[\033[1;32m\]\u@\h/\j \[\033[1;33m\]\W\[\033[1;34m\]\$(ps1_git)\[\033[00m\]\$ "
 
-if command -v hub >/dev/null 2>&1; then
-  eval "$(hub alias -s)"
-fi
-
-[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm"
+eval "$(hub alias -s)"

data/bin/templates/tanjun_schema.yml

@@ -0,0 +1,37 @@
+type: map
+mapping:
+  "rubies":
+    type: seq
+  "paths":
+    type: seq
+  "gems":
+    type: seq
+    sequence:
+      - type: map
+        mapping:
+          "name":
+            required: yes
+          "version":
+  "vundles":
+    type: seq
+  "personal":
+    type: map
+    mapping:
+      "full_name":
+        required: yes
+      "email":
+        required: yes
+      "github_user":
+
+  "gitconfig":
+    type: seq
+    sequence:
+      - type: map
+        mapping:
+          "key":
+            required: yes
+          "value":
+            required: yes
+  "ssh":
+    type: map
+    mapping:

data/bin/templates/vimrc

@@ -0,0 +1,50 @@
+set nocompatible
+filetype off
+
+set rtp+=~/.vim/bundle/vundle
+call vundle#rc()
+
+Bundle 'gmarik/vundle'
+<%- @vundles.each do |vundle| %>
+Bundle '<%= vundle %>'
+<%- end %>
+
+filetype plugin indent on
+
+syntax on
+set background=dark
+set ruler
+set more
+set number
+set autoindent
+set expandtab
+set softtabstop=2
+set shiftwidth=2
+set scrolloff=5
+set history=200
+set backspace=indent,eol,start
+set wrap
+set linebreak
+set showbreak=>\ \ \
+set undolevels=1000
+set complete=.,w,b,u,U,t,i,d
+set ttyfast
+set showmatch
+set ignorecase
+set smartcase
+nore ; :
+nore , ;
+inoremap <Down> <C-o>gj
+inoremap <Up> <C-o>gk
+set list
+set listchars=tab:>·,trail:·
+set textwidth=80
+set colorcolumn=+1
+inoremap jk <Esc>
+inoremap kj <Esc>
+inoremap jj <Esc>
+inoremap kk <Esc>
+autocmd BufWritePost .vimrc source %
+autocmd BufWritePre * :%s/\s\+$//e
+set hidden
+set wildmenu

data/lib/tanjun.rb

@@ -3,3 +3,4 @@ require "open-uri"
 require "tanjun/core_ext/open-uri"
 require "thor"
 require "tanjun/thor_ext/actions"
+require "tanjun/thor_ext/shell/basic"

data/lib/tanjun/thor_ext/shell/basic.rb

@@ -0,0 +1,37 @@
+require 'tanjun/thor_ext/shell/password'
+
+class Thor
+  module Shell
+    class Basic
+      include Password
+
+      # Asks something to the user and receives a response.
+      #
+      # If asked to limit the correct responses, you can pass in an
+      # array of acceptable answers.  If one of those is not supplied,
+      # they will be shown a message stating that one of those answers
+      # must be given and re-asked the question.
+      #
+      # ==== Example
+      # ask("What is your name?")
+      #
+      # ask("What is your favorite Neopolitan flavor?", :limited_to => ["strawberry", "chocolate", "vanilla"])
+      #
+      def ask(statement, *args)
+        options = args.last.is_a?(Hash) ? args.pop : {}
+        response = if options[:limited_to]
+          ask_filtered(statement, options[:limited_to], *args)
+        elsif options[:password]
+          ask_passwordly(statement, *args)
+        else
+          ask_simply(statement, *args)
+        end
+
+        if options[:required] && response.to_s.strip.length == 0
+          say "Your response can't be empty. Please try again."
+          ask(statement, *args.push(options)
+        end
+      end
+    end
+  end
+end

data/lib/tanjun/thor_ext/shell/password.rb

@@ -0,0 +1,41 @@
+re 'tempfile'
+
+class Thor
+  module Shell
+    module Password
+      if RUBY_PLATFORM =~ /mswin32|mingw32/
+
+        def ask_passwordly(statement, color = nil)
+          say("#{statement} ", color)
+
+          require "Win32API"
+          char = nil
+          password = ''
+
+          while char = Win32API.new("crtdll", "_getch", [ ], "L").Call do
+            break if char == 10 || char == 13 # received carriage return or newline
+            if char == 127 || char == 8 # backspace and delete
+              password.slice!(-1, 1)
+            else
+              # windows might throw a -1 at us so make sure to handle RangeError
+              (password << char.chr) rescue RangeError
+            end
+          end
+          puts
+          return password
+        end
+
+      else
+
+        def ask_passwordly(statement, color = nil)
+          system "stty -echo"
+          password = ask(statement, color)
+          puts
+          return password
+        ensure
+          system "stty echo"
+        end
+      end
+    end
+  end
+end

data/lib/tanjun/version.rb

@@ -1,3 +1,3 @@
 module Tanjun
-  VERSION = "0.0.1.alpha3"
+  VERSION = "0.0.1.alpha4"
 end

data/tanjun.gemspec

@@ -16,4 +16,6 @@ Gem::Specification.new do |gem|
   gem.version       = Tanjun::VERSION
 
   gem.add_dependency 'thor', '~> 0.14.6'
+  gem.add_dependency 'hashie', '~> 1.2.0'
+  gem.add_dependency 'kwalify', '~> 0.7.2'
 end

metadata

@@ -1,40 +1,78 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: tanjun
-version: !ruby/object:Gem::Version
-  version: 0.0.1.alpha3
-  prerelease: 6
+version: !ruby/object:Gem::Version 
+  prerelease: true
+  segments: 
+  - 0
+  - 0
+  - 1
+  - alpha4
+  version: 0.0.1.alpha4
 platform: ruby
-authors:
+authors: 
 - Rupert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-14 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-04-16 00:00:00 +01:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: thor
-  requirement: !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 14
+        - 6
         version: 0.14.6
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: hashie
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.14.6
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 0
+        version: 1.2.0
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: kwalify
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 7
+        - 2
+        version: 0.7.2
+  type: :runtime
+  version_requirements: *id003
 description: A collection  of tools for faster development
-email:
+email: 
 - rupert@madden-abbott.com
-executables:
+executables: 
 - tanjun
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - Gemfile
 - LICENSE
@@ -45,7 +83,10 @@ files:
 - bin/project
 - bin/tanjun
 - bin/templates/gitignore
+- bin/templates/tanjun.yml
 - bin/templates/tanjun_profile
+- bin/templates/tanjun_schema.yml
+- bin/templates/vimrc
 - lib/interact/templates/meta/script.rb
 - lib/interact/templates/project/app/views/layout/application.html.haml.tt
 - lib/tanjun.rb
@@ -54,30 +95,43 @@ files:
 - lib/tanjun/generators/bootstrap-sass/install/install_generator.rb
 - lib/tanjun/generators/guard/install/install_generator.rb
 - lib/tanjun/thor_ext/actions.rb
+- lib/tanjun/thor_ext/shell/basic.rb
+- lib/tanjun/thor_ext/shell/password.rb
 - lib/tanjun/version.rb
 - tanjun.gemspec
+has_rdoc: true
 homepage: http://github.com/rupert654/tanjun
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>'
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 3
+      - 1
       version: 1.3.1
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Scripts and generators to speed up your development
 test_files: []
+