infinum_setup 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57fff117c55d30e9a90dd2231855b0dc761ec75c
-  data.tar.gz: 98e7bb6ccef21afd9423dff514b6af822f568cbc
+  metadata.gz: bd77d68258782349e56237c0dcc94840c5d1e6b6
+  data.tar.gz: 0a28bba0c0af364e538f93a12ef561ab5c60f4ec
 SHA512:
-  metadata.gz: 05df732d6b2f67ef46d1b2ae127464cc49e1c70a4c2f4c3ab0847ac331ef1d3cbb21b754009815f142705db131b690315503a8688a9d890941156df391ca697e
-  data.tar.gz: 802e904235185bb0a72ab0d7dc4f79cddf66effb650b6d16c579f3cdb9e7a440f545e80f0d6f0ed509236b1d65096310d2f2e6278b695c776300562cb056f89b
+  metadata.gz: 8099b9fc31c7298c3e62627d94aaacff4b8bdd879523b3390d94cb47b65507b0ced340ac59a479f5db6d18a87b93cc1090344671f9edc7b9415b5db65cd56fe3
+  data.tar.gz: 6d2d65d94f8e6c3613873b2abb5e3a36a9b52de99c15b97899b3030ac059c377f4695108587f0b73553cefd000cc44b50186957c1613e27d696050b58819a8a1

data/README.md

@@ -32,14 +32,13 @@ During setup two config files are loaded: `general.yml` and `#{team}.yml`. These
 
 ``` ruby
 {program_name}:
-  type: brew/cask/gem/npm/command
+  type: brew/cask/gem/npm/script
   mandatory: true/false
   install_if_not_interactive: true/false
   program: {program}
   pre_install_comment: A comment to print out before installing
   post_install_comment: A comment to print out after install
   post_install_command: eg. open the app
-  script: a script to be run if type is `command`
 ```
 
 ### command type
@@ -52,6 +51,29 @@ There are (for now) 5 types of programs with which to install:
 - npm  => `npm -g install {program}`
 - command => `{script}`
 
+### Valid keys by type
+
+For brew/cask/gem/npm valid keys are:
+
+* :type
+* :mandatory
+* :install_if_not_interactive
+* :pre_install_comment
+* :post_install_comment
+* :post_install_command
+* :program
+
+For script/ruby_script valid keys are
+
+* :type
+* :mandatory
+* :install_if_not_interactive
+* :pre_install_comment
+* :post_install_comment
+* :post_install_command
+* :script
+* :custom_install_question
+
 ### Mandatory
 
 Set this setting to `true` if you feel like a program must be installed.
@@ -69,10 +91,16 @@ Comments to print out before/after installation.
 
 Use this if you want to run a custom command after installation. Eg. `open /Applications/Alfred\ 3.app`
 
+### Custom install question
+
+For most of the types the install question is 'Installing #{program}?', but for scripts you can ask your own custom question.
+
 ### Writing your own scripts
 
 You can use `scripts` folder for writing your own scripts just as I did for ruby.
 
+
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/infinum/infinum_setup. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.

data/lib/infinum_setup.rb

@@ -2,8 +2,15 @@ require 'yaml'
 require 'open-uri'
 require 'tty-prompt'
 require 'tty-which'
+require 'infinum_setup/program/helpers'
+require 'infinum_setup/program/base'
+require 'infinum_setup/program/brew'
+require 'infinum_setup/program/cask'
+require 'infinum_setup/program/gem'
+require 'infinum_setup/program/npm'
+require 'infinum_setup/program/script'
+require 'infinum_setup/program/ruby_script'
 require 'infinum_setup/base'
-require 'infinum_setup/program'
 require 'infinum_setup/general'
 require 'infinum_setup/team'
 require 'infinum_setup/install'

data/lib/infinum_setup/base.rb

@@ -1,6 +1,6 @@
 module InfinumSetup
   class Base
-    def initialize(options)
+    def initialize(options = {})
       @options = options
     end
 
@@ -9,46 +9,41 @@ module InfinumSetup
     end
 
     def call
-      programs.each do |program|
-        next unless will_install?(program)
-        puts
-        prompt.say("#{program.name} -- #{program.pre_install_comment}", color: :cyan) if program.pre_install_comment
-        next if skip_install?(program)
-        program.install
-      end
+      return unless team_programs.is_a?(Hash)
+      programs.map(&:install)
     end
 
-    private
-
-    attr_reader :options
-
-    def programs(team = 'general')
-      @programs ||=
-        if InfinumSetup.dev?
-          YAML.load_file("programs/#{team}.yml")
-        else
-          YAML.load(
-            open("https://raw.github.com/infinum/infinum_setup/master/programs/#{team}.yml")
-          )
-        end.map do |name, settings|
-          Program.new(name, settings, options, prompt)
-        end
+    def programs
+      @programs ||= team_programs.map do |name, settings|
+        program_type(settings['type'], name).new(name, settings, options)
+      end
     end
 
-    def will_install?(program)
-      program.mandatory? ||
-        (!program.mandatory? && interactive?) ||
-        (!program.mandatory? && !interactive? && program.install_if_not_interactive?)
+    def team_programs(team = 'general')
+      if InfinumSetup.dev?
+        YAML.load_file("programs/#{team}.yml")
+      else
+        YAML.load(
+          open("https://raw.github.com/infinum/infinum_setup/master/programs/#{team}.yml")
+        )
+      end
     end
 
-    def skip_install?(program)
-      !program.mandatory? &&
-        interactive? &&
-        !prompt.yes?("#{program.name} -- Install #{program.name}")
-    end
+    private
 
-    def prompt
-      @prompt ||= TTY::Prompt.new
+    attr_reader :options
+
+    def program_type(type, name)
+      case type
+      when 'brew' then Program::Brew
+      when 'cask' then Program::Cask
+      when 'gem' then Program::Gem
+      when 'npm' then Program::Npm
+      when 'script' then Program::Script
+      when 'ruby_script' then Program::RubyScript
+      else
+        raise "#{name} -- Type #{type} not recognized"
+      end
     end
 
     def interactive?

data/lib/infinum_setup/program/base.rb

@@ -0,0 +1,67 @@
+module InfinumSetup
+  module Program
+    class Base
+      include InfinumSetup::Program::Helpers
+      attr_reader :name, :settings, :options
+
+      def initialize(name, settings, options)
+        @name = name
+        @settings = settings
+        @options = options
+      end
+
+      def install
+        return unless will_install?
+        puts
+        prompt_pre_install_comment
+        return if skip_install?
+        prompt_installing
+        execute_command
+        prompt_post_install_comment
+        execute_command(post_install_command) if post_install_command
+      end
+
+      def valid_keys
+        [
+          :mandatory, :pre_install_comment, :post_install_comment, :type,
+          :install_if_not_interactive, :post_install_command
+        ]
+      end
+
+      def valid?
+        return true if settings.keys.all? { |key| valid_keys.include?(key.to_sym) }
+        raise "#{name} -- Settings are not correct"
+      end
+
+      def mandatory?
+        settings['mandatory']
+      end
+
+      def install_if_not_interactive?
+        settings['install_if_not_interactive']
+      end
+
+      def pre_install_comment
+        settings['pre_install_comment']
+      end
+
+      def post_install_comment
+        settings['post_install_comment']
+      end
+
+      def post_install_command
+        settings['post_install_command']
+      end
+
+      private
+
+      def command
+        raise NotImplementedError
+      end
+
+      def prompt
+        @prompt ||= TTY::Prompt.new
+      end
+    end
+  end
+end

data/lib/infinum_setup/program/brew.rb

@@ -0,0 +1,17 @@
+module InfinumSetup
+  module Program
+    class Brew < Base
+      def valid_keys
+        super + [:program]
+      end
+
+      def command
+        "brew install #{program}"
+      end
+
+      def program
+        settings['program']
+      end
+    end
+  end
+end

data/lib/infinum_setup/program/cask.rb

@@ -0,0 +1,17 @@
+module InfinumSetup
+  module Program
+    class Cask < Base
+      def valid_keys
+        super + [:program]
+      end
+
+      def command
+        "brew cask install #{program}"
+      end
+
+      def program
+        settings['program']
+      end
+    end
+  end
+end

data/lib/infinum_setup/program/gem.rb

@@ -0,0 +1,17 @@
+module InfinumSetup
+  module Program
+    class Gem < Base
+      def valid_keys
+        super + [:program]
+      end
+
+      def command
+        %(export PATH="$HOME/.rbenv/bin:$PATH";eval "$(rbenv init -)";gem install #{program} --no-document)
+      end
+
+      def program
+        settings['program']
+      end
+    end
+  end
+end

data/lib/infinum_setup/program/helpers.rb

@@ -0,0 +1,44 @@
+module InfinumSetup
+  module Program
+    module Helpers
+      def prompt_pre_install_comment
+        prompt.say("#{name} -- #{pre_install_comment}", color: :cyan) if pre_install_comment
+      end
+
+      def prompt_installing
+        prompt.ok "#{name} -- Installing"
+      end
+
+      def prompt_post_install_comment
+        prompt.say("#{name} -- #{post_install_comment}", color: :cyan) if post_install_comment
+      end
+
+      def will_install?
+        mandatory? ||
+          (!mandatory? && options.interactive) ||
+          (!mandatory? && !options.interactive && install_if_not_interactive?)
+      end
+
+      def skip_install?
+        !mandatory? && options.interactive && !prompt.yes?(install_question)
+      end
+
+      def install_question
+        "Install #{name}"
+      end
+
+      def execute_command(cmd = command)
+        options.simulate ? simulate(cmd) : execute(cmd)
+      end
+
+      def simulate(cmd)
+        prompt.warn "#{name} -- #{cmd}"
+      end
+
+      def execute(cmd)
+        prompt.warn cmd if options.verbose
+        puts `#{cmd}`
+      end
+    end
+  end
+end

data/lib/infinum_setup/program/npm.rb

@@ -0,0 +1,17 @@
+module InfinumSetup
+  module Program
+    class Npm < Base
+      def valid_keys
+        super + [:program]
+      end
+
+      def command
+        "npm -g install #{program}"
+      end
+
+      def program
+        settings['program']
+      end
+    end
+  end
+end

data/lib/infinum_setup/program/ruby_script.rb

@@ -0,0 +1,37 @@
+module InfinumSetup
+  module Program
+    class RubyScript < Base
+      def valid_keys
+        super + [:script, :custom_install_question]
+      end
+
+      def command
+        script
+      end
+
+      def execute
+        eval script
+      end
+
+      def script
+        if InfinumSetup.dev?
+          File.read(settings['script'])
+        else
+          open("https://raw.github.com/infinum/infinum_setup/master/scripts/#{settings['scripts']}.yml")
+        end
+      end
+
+      def custom_install_question
+        settings['custom_install_question']
+      end
+
+      def install_question
+        [name, custom_install_question ? custom_install_question : "Install #{name}"].join(' -- ')
+      end
+
+      def prompt_installing
+        prompt.ok "#{name} -- #{custom_install_question ? 'Running' : 'Installing'}"
+      end
+    end
+  end
+end

data/lib/infinum_setup/program/script.rb

@@ -0,0 +1,29 @@
+module InfinumSetup
+  module Program
+    class Script < Base
+      def valid_keys
+        super + [:script, :custom_install_question]
+      end
+
+      def command
+        script
+      end
+
+      def script
+        settings['script']
+      end
+
+      def custom_install_question
+        settings['custom_install_question']
+      end
+
+      def install_question
+        [name, custom_install_question ? custom_install_question : "Install #{name}"].join(' -- ')
+      end
+
+      def prompt_installing
+        prompt.ok "#{name} -- #{custom_install_question ? 'Running' : 'Installing'}"
+      end
+    end
+  end
+end

data/lib/infinum_setup/team.rb

@@ -1,6 +1,6 @@
 module InfinumSetup
   class Team < Base
-    def programs
+    def team_programs
       super(@options.team)
     end
   end

data/lib/infinum_setup/version.rb

@@ -1,3 +1,3 @@
 module InfinumSetup
-  VERSION = '0.6.0'.freeze
+  VERSION = '0.7.0'.freeze
 end

data/programs/android.yml

@@ -1,9 +1,9 @@
-{program_name}:
-  type: brew/cask/gem/npm/command
-  mandatory: true/false
-  install_if_not_interactive: true/false
-  program: {program}
-  pre_install_comment: A comment to print out before installing
-  post_install_comment: A comment to print out after install
-  post_install_command: eg. open the app
-  script: a script to be run if type is `command`
+# {program_name}:
+#   type: brew/cask/gem/npm/command
+#   mandatory: true/false
+#   install_if_not_interactive: true/false
+#   program: {program}
+#   pre_install_comment: A comment to print out before installing
+#   post_install_comment: A comment to print out after install
+#   post_install_command: eg. open the app
+#   script: a script to be run if type is `command`

data/programs/design.yml

@@ -1,9 +1,9 @@
-{program_name}:
-  type: brew/cask/gem/npm/command
-  mandatory: true/false
-  install_if_not_interactive: true/false
-  program: {program}
-  pre_install_comment: A comment to print out before installing
-  post_install_comment: A comment to print out after install
-  post_install_command: eg. open the app
-  script: a script to be run if type is `command`
+# {program_name}:
+#   type: brew/cask/gem/npm/command
+#   mandatory: true/false
+#   install_if_not_interactive: true/false
+#   program: {program}
+#   pre_install_comment: A comment to print out before installing
+#   post_install_comment: A comment to print out after install
+#   post_install_command: eg. open the app
+#   script: a script to be run if type is `command`

data/programs/general.yml

@@ -12,6 +12,36 @@ git:
   mandatory: true
   type: brew
   program: git
+coreutils:
+  mandatory: true
+  type: brew
+  program: coreutils
+htop-osx:
+  mandatory: true
+  type: brew
+  program: htop-osx
+curl:
+  mandatory: true
+  type: brew
+  program: curl
+wget:
+  mandatory: true
+  type: brew
+  program: wget
+bash:
+  mandatory: false
+  install_if_not_interactive: true
+  type: brew
+  program: bash
+zsh:
+  mandatory: false
+  install_if_not_interactive: true
+  type: brew
+  program: zsh
+fish:
+  mandatory: false
+  type: brew
+  program: fish
 rbenv:
   mandatory: true
   type: brew
@@ -39,11 +69,23 @@ OhMyZsh:
   install_if_not_interactive: true
   type: script
   script: curl -L https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh | sh
+ssh-keygen:
+  pre_install_comment: Will run ssh-keygen
+  post_install_comment: Please add your public key to https://docs.google.com/spreadsheets/d/1Wo4OYVWsCW6I1IxrSzieLkmTiP6XjCjLtyoMmJpnkZg/edit
+  mandatory: false
+  install_if_not_interactive: true
+  type: script
+  script: ssh-keygen
+  custom_install_question: Setup ssh keys with ssh-keygen
 ruby:
   pre_install_comment: This will install the lastest ruby version and add rbenv to your .bash_profile and .zshrc files. Go grab a coffee
   mandatory: true
   type: script
   script: curl -L https://raw.github.com/infinum/infinum_setup/master/scripts/ruby.sh | sh
+python:
+  mandatory: false
+  type: brew
+  program: python
 z:
   pre_install_comment:  After a short learning phase, z will take you to the most 'recent' directory that matches ALL of the regexes given on the command line, in order.
   post_install_comment: "Please read 'brew info z' for how to enable it. How to use: https://github.com/rupa/z"
@@ -51,6 +93,13 @@ z:
   install_if_not_interactive: true
   type: brew
   program: z
+git-wizard:
+  type: ruby_script
+  mandatory: false
+  install_if_not_interactive: true
+  pre_install_comment: This will help you setup your git
+  script: scripts/git_wizard.rb
+  custom_install_question: Run git wizard
 alfred:
   pre_install_comment: App for Mac OS X which boosts your efficiency with hotkeys, keywords, text expansion and more.
   post_install_comment: Please start alfred once, enable it and disable spotlight (http://apple.stackexchange.com/a/177987). Recommended to enable clipboard history
@@ -59,6 +108,13 @@ alfred:
   type: cask
   program: alfred
   post_install_command: open /Application/Alfred\ 3.app
+iterm2:
+  pre_install_comment: iTerm2 is a replacement for Terminal and the successor to iTerm
+  mandatory: false
+  install_if_not_interactive: true
+  type: cask
+  program: iterm2
+  post_install_command: open /Application/iTerm.app
 flycut:
   pre_install_comment: Clean and simple clipboard manager for developers
   mandatory: false

data/programs/ios.yml

@@ -1,9 +1,9 @@
-{program_name}:
-  type: brew/cask/gem/npm/command
-  mandatory: true/false
-  install_if_not_interactive: true/false
-  program: {program}
-  pre_install_comment: A comment to print out before installing
-  post_install_comment: A comment to print out after install
-  post_install_command: eg. open the app
-  script: a script to be run if type is `command`
+# {program_name}:
+#   type: brew/cask/gem/npm/command
+#   mandatory: true/false
+#   install_if_not_interactive: true/false
+#   program: {program}
+#   pre_install_comment: A comment to print out before installing
+#   post_install_comment: A comment to print out after install
+#   post_install_command: eg. open the app
+#   script: a script to be run if type is `command`

data/programs/javascript.yml

@@ -1,9 +1,9 @@
-{program_name}:
-  type: brew/cask/gem/npm/command
-  mandatory: true/false
-  install_if_not_interactive: true/false
-  program: {program}
-  pre_install_comment: A comment to print out before installing
-  post_install_comment: A comment to print out after install
-  post_install_command: eg. open the app
-  script: a script to be run if type is `command`
+# {program_name}:
+#   type: brew/cask/gem/npm/command
+#   mandatory: true/false
+#   install_if_not_interactive: true/false
+#   program: {program}
+#   pre_install_comment: A comment to print out before installing
+#   post_install_comment: A comment to print out after install
+#   post_install_command: eg. open the app
+#   script: a script to be run if type is `command`

data/programs/pm.yml

@@ -1,9 +1,9 @@
-{program_name}:
-  type: brew/cask/gem/npm/command
-  mandatory: true/false
-  install_if_not_interactive: true/false
-  program: {program}
-  pre_install_comment: A comment to print out before installing
-  post_install_comment: A comment to print out after install
-  post_install_command: eg. open the app
-  script: a script to be run if type is `command`
+# {program_name}:
+#   type: brew/cask/gem/npm/command
+#   mandatory: true/false
+#   install_if_not_interactive: true/false
+#   program: {program}
+#   pre_install_comment: A comment to print out before installing
+#   post_install_comment: A comment to print out after install
+#   post_install_command: eg. open the app
+#   script: a script to be run if type is `command`

data/programs/rails.yml

@@ -14,10 +14,12 @@ mysql:
   mandatory: true
   type: brew
   program: mysql
+  post_install_command: brew services start mysql
 postgresql:
   mandatory: true
   type: brew
   program: postgresql
+  post_install_command: brew services start postgresql; createuser -s postgres
 sequel-pro:
   pre_install_comment: Sequel Pro is a fast, easy-to-use Mac database management application for working with MySQL databases.
   mandatory: false

data/scripts/git_wizard.rb

@@ -0,0 +1,13 @@
+email = prompt.ask('Your git email')
+`git config --global user.email "#{email}"`
+
+name = prompt.ask('Your git name')
+`git config --global user.name "#{name}"`
+
+autocorrect = prompt.yes?('Turn on autocorrect')
+`git config --global help.autocorrect #{autocorrect ? 1 : 0}`
+
+editor = promtp.ask('Default editor command?(atom --wait, subl -n -w, vim)')
+`git config --global core.editor "#{editor}"`
+
+`git config --global push.default current`

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infinum_setup
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Stjepan Hadjic
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-05 00:00:00.000000000 Z
+date: 2017-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -132,7 +132,14 @@ files:
 - lib/infinum_setup/base.rb
 - lib/infinum_setup/general.rb
 - lib/infinum_setup/install.rb
-- lib/infinum_setup/program.rb
+- lib/infinum_setup/program/base.rb
+- lib/infinum_setup/program/brew.rb
+- lib/infinum_setup/program/cask.rb
+- lib/infinum_setup/program/gem.rb
+- lib/infinum_setup/program/helpers.rb
+- lib/infinum_setup/program/npm.rb
+- lib/infinum_setup/program/ruby_script.rb
+- lib/infinum_setup/program/script.rb
 - lib/infinum_setup/team.rb
 - lib/infinum_setup/version.rb
 - programs/android.yml
@@ -142,6 +149,7 @@ files:
 - programs/javascript.yml
 - programs/pm.yml
 - programs/rails.yml
+- scripts/git_wizard.rb
 - scripts/ruby.sh
 homepage: https://github.com/infinum/infinum_setup
 licenses:

data/lib/infinum_setup/program.rb

@@ -1,65 +0,0 @@
-module InfinumSetup
-  class Program
-    VALID_KEYS = [
-      :mandatory, :pre_install_comment, :post_install_comment, :type, :program, :script,
-      :install_if_not_interactive, :post_install_command
-    ].freeze
-
-    attr_reader :settings, :name, :options, :prompt
-
-    def initialize(name, settings, options, prompt)
-      @name = name
-      @settings = settings
-      @options = options
-      @prompt = prompt
-    end
-
-    def valid?
-      settings.keys.all? { |key| VALID_KEYS.include?(key.to_sym) }
-    end
-
-    def install
-      prompt.ok "#{name} -- Installing"
-      execute_type
-      prompt.say("#{name} -- #{post_install_comment}", color: :cyan) if post_install_comment
-      execute(post_install_command) if post_install_command
-    end
-
-    def mandatory?
-      mandatory
-    end
-
-    def install_if_not_interactive?
-      install_if_not_interactive
-    end
-
-    VALID_KEYS.each do |key|
-      define_method key do
-        settings[key.to_s]
-      end
-    end
-
-    private
-
-    def execute_type
-      case type
-      when 'brew' then execute "brew install #{program}"
-      when 'cask' then execute "brew cask install #{program}"
-      when 'gem' then execute %(export PATH="$HOME/.rbenv/bin:$PATH";eval "$(rbenv init -)";gem install #{program} --no-document)
-      when 'npm' then execute "npm -g install #{program}"
-      when 'script' then execute script
-      else
-        raise "Unknown type #{type}"
-      end
-    end
-
-    def execute(cmd)
-      if options.simulate
-        prompt.warn "#{name} -- #{cmd}"
-      else
-        prompt.warn cmd if options.verbose
-        puts `#{cmd}`
-      end
-    end
-  end
-end