infinum_setup 0.1.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3d1e029f99e2b500c2bf5acf16092f333dbf511
-  data.tar.gz: abc67b8bd0eb1c2617b31ddd72e6c0f2dd4d960e
+  metadata.gz: 57fff117c55d30e9a90dd2231855b0dc761ec75c
+  data.tar.gz: 98e7bb6ccef21afd9423dff514b6af822f568cbc
 SHA512:
-  metadata.gz: cbd8c165429f4ac3260496660798119ab0f642fa9b2f4ecd591a0347cc2fe9f29e2dc3ce3b02ab7b22e149d781401eabf1d34cb2f9d3a94b55fd34f8a2ae7e0f
-  data.tar.gz: 7d8410f59ace8a2ae2d0c1b8a057921d70718bbf085d19daa2d6d3f0d62f3049c77a333c08d20869251961ce7ab67f688749fec6fede04bd95bb2754e66755e7
+  metadata.gz: 05df732d6b2f67ef46d1b2ae127464cc49e1c70a4c2f4c3ab0847ac331ef1d3cbb21b754009815f142705db131b690315503a8688a9d890941156df391ca697e
+  data.tar.gz: 802e904235185bb0a72ab0d7dc4f79cddf66effb650b6d16c579f3cdb9e7a440f545e80f0d6f0ed509236b1d65096310d2f2e6278b695c776300562cb056f89b

data/README.md

@@ -20,95 +20,54 @@ For a more advanced usage you can use:
 
 This is an interactive mode where you will be asked if you want to install optional programs/packages
 
+    $ infinum_setup --verbose
+
+This will print out all the commands that are run
+
 ## Development
 
+During setup two config files are loaded: `general.yml` and `#{team}.yml`. These files are downloaded from the master branch so I do not need to release new gem versions every time we update one of those files :)
+
 ### Content of program/#{team}.yml files
 
 ``` ruby
-brew:
-  mandatory:
-    - imagemagick
-    - node
-    - mysql
-    - postgresql
-  optional:
-cask:
-  mandatory:
-  optional:
-    - sequel-pro
-    - - flycut
-      - jumpcut
-    - postico
-gem:
-  mandatory:
-  optional:
-    - bundler
-    - rails
-command:
-  mandatory:
-  optional:
-    pow: curl get.pow.cx | sh
+{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`
 ```
 
-### Top level commands
-
-There are (for now) 5 top level commands you can use:
+### command type
 
-- brew
-- cask
-- gem
-- npm
-- command
+There are (for now) 5 types of programs with which to install:
 
-### Optionality
+- brew => `brew install {program}`
+- cask => `brew cask install {program}`
+- gem  => `gem install {program}`
+- npm  => `npm -g install {program}`
+- command => `{script}`
 
-Next level is the optionality of the programs. If you feel like a program must be installed put it under `mandatory` key.
-If you feel like a program is a nice to have but not mandatory put it under `optional` key. If `infinum_setup` is run in interactive mode a user will be prompted for each optional program.
+### Mandatory
 
-### Programs
-
-For each of the top level commands except `command`, the script requires an array of programs.
-
-``` ruby
-cask:
-  optional:
-    - skype
-    - vcl
-```
+Set this setting to `true` if you feel like a program must be installed.
+If `infinum_setup` is run in interactive mode a user will be prompted for each non mandatroy program.
 
-You can also write an array of programs where in interactive mode the user will be prompted with a multiple select choice, and in non interactive mode the first program will be installed.
+### Install if not interactive
 
-``` ruby
-cask:
-  optional:
-    - - google-chrome
-      - firefox
-    - slack
-```
+This will come into effect if a program is not mandatory and the `infinum_setup` is not run in interactive mode. With this setting set to `true` the program will be installed otherwise it will be skipped.
 
-```
-Select programs to install (Use arrow keys, press Space to select and Enter to finish)
-‣ ⬡ google-chrome
-  ⬡ firefox
-```
+### Pre/post install comment
 
-The `commands` programs expect a hash instead of an array. These commands will be run directly as they are written
+Comments to print out before/after installation.
 
-``` ruby
-command:
-  mandatory:
-    ruby: curl -L https://raw.github.com/infinum/infinum_setup/master/scripts/ruby.sh | sh
-  optional:
-    OhMyZsh: curl -L https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh | sh
-```
+### Post install command
 
-```
-Installing ruby
-curl -L https://raw.github.com/infinum/infinum_setup/master/scripts/ruby.sh | sh
-Install OhMyZsh Yes
-Installing OhMyZsh
-curl -L https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh | sh
-```
+Use this if you want to run a custom command after installation. Eg. `open /Applications/Alfred\ 3.app`
 
 ### Writing your own scripts
 

data/exe/infinum_setup

@@ -15,6 +15,7 @@ command :install do |c|
   c.syntax = 'infinum_setup'
   c.description = 'Setups your laptop'
   c.option '-i', '--interactive', 'For expierienced users'
+  c.option '-V', '--verbose', 'Print out commands'
   c.option '-s', '--simulate', 'Try before you buy'
   c.action do |_args, options|
     options.team = InfinumSetup::Install.select_team

data/lib/infinum_setup/base.rb

@@ -8,110 +8,55 @@ module InfinumSetup
       new(options).call
     end
 
-    private
-
     def call
-      raise NotImplemented
-    end
-
-    def interactive?
-      @options.interactive
-    end
-
-    def simulate?
-      @options.simulate
-    end
-
-    def prompt
-      @prompt ||= TTY::Prompt.new
-    end
-
-    def execute(cmd)
-      if simulate?
-        prompt.warn cmd
-      else
-        `#{cmd}`
+      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
     end
 
-    def install_programs
-      commands.each do |command_name, command_hash|
-        next unless command_hash
-        command_hash.each do |optionality, programs|
-          next unless programs
-          case programs
-          when Hash
-            programs.each do |program, command|
-              case optionality
-              when 'mandatory' then install_program(program, command)
-              when 'optional' then install_if_agree(program, command)
-              end
-            end
-          else
-            programs.each do |program|
-              case optionality
-              when 'mandatory' then install_program(program, command_name)
-              when 'optional' then install_if_agree(program, command_name)
-              end
-            end
-          end
-        end
-      end
-    end
+    private
 
-    def commands(team = 'general')
-      @commands ||=
+    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"))
+          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
     end
 
-    def install_if_agree(programs, command)
-      case programs
-      when String
-        return if interactive? && !prompt.yes?("Install #{programs}")
-        install_program(programs, command)
-      when Hash
-        return if interactive? && !prompt.yes?("Install #{programs.keys.first}")
-        install_program(programs.keys.first, programs.values.first)
-      when Array
-        if interactive?
-          choices = prompt.multi_select('Select programs to install', programs)
-          choices.each { |choice| install_program(choice, command) }
-        else
-          install_program(programs.first, command)
-        end
-      end
+    def will_install?(program)
+      program.mandatory? ||
+        (!program.mandatory? && interactive?) ||
+        (!program.mandatory? && !interactive? && program.install_if_not_interactive?)
     end
 
-    def install_program(program, command)
-      return if !simulate? && program_exist?(program, command)
-      prompt.ok "Installing #{program}"
-      case command
-      when 'brew'
-        execute "brew install #{program}"
-      when 'cask'
-        execute "brew cask install #{program}"
-      when 'gem'
-        execute "gem install #{program} --no-document"
-      when 'npm'
-        execute "npm -g install #{program}"
-      else
-        execute command
-      end
+    def skip_install?(program)
+      !program.mandatory? &&
+        interactive? &&
+        !prompt.yes?("#{program.name} -- Install #{program.name}")
     end
 
-    def program_exist?(program, command)
-      case command
-      when 'cask'
-        !`brew cask info #{program}`.include?('Not installed')
-      when 'brew', 'gem'
-        TTY::Which.exist?(program)
-      else
-        false
-      end
+    def prompt
+      @prompt ||= TTY::Prompt.new
+    end
+
+    def interactive?
+      options.interactive
+    end
+
+    def simulate?
+      options.simulate
     end
   end
 end

data/lib/infinum_setup/general.rb

@@ -1,22 +1,4 @@
 module InfinumSetup
   class General < Base
-    def call
-      install_xcode_select
-      install_brew
-      install_programs
-    end
-
-    private
-
-    def install_xcode_select
-      prompt.ok 'Installing xcode-select'
-      execute %(sudo xcode-select --install)
-    end
-
-    def install_brew
-      return if !simulate? && TTY::Which.exist?('brew')
-      prompt.ok 'Installing brew'
-      execute %(/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)")
-    end
   end
 end

data/lib/infinum_setup/program.rb

@@ -0,0 +1,65 @@
+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

data/lib/infinum_setup/team.rb

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

data/lib/infinum_setup/version.rb

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

data/lib/infinum_setup.rb

@@ -3,6 +3,7 @@ require 'open-uri'
 require 'tty-prompt'
 require 'tty-which'
 require 'infinum_setup/base'
+require 'infinum_setup/program'
 require 'infinum_setup/general'
 require 'infinum_setup/team'
 require 'infinum_setup/install'

data/programs/android.yml

@@ -1,12 +1,9 @@
-brew:
-  mandatory:
-  optional:
-cask:
-  mandatory:
-  optional:
-gem:
-  mandatory:
-  optional:
-command:
-  mandatory:
-  optional:
+{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,12 +1,9 @@
-brew:
-  mandatory:
-  optional:
-cask:
-  mandatory:
-  optional:
-gem:
-  mandatory:
-  optional:
-command:
-  mandatory:
-  optional:
+{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

@@ -1,27 +1,136 @@
+xcode-select:
+  mandatory: true
+  type: script
+  script: sudo xcode-select --install
+  post_install_comment: A window will popup asking you if you want to install only esential tools or the whole XCode.
 brew:
-  mandatory:
-    - git
-    - ack
-    - rbenv
-command:
-  mandatory:
-    ruby: curl -L https://raw.github.com/infinum/infinum_setup/master/scripts/ruby.sh | sh
-  optional:
-    OhMyZsh: curl -L https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh | sh
-cask:
-  mandatory:
-    - slack
-  optional:
-    - alfred
-    - dropbox
-    - google-drive
-    - - flycut
-      - jumpcut
-    - spectacle
-    - - google-chrome
-      - firefox
-    - skype
-    - - atom
-      - sublime-text
-    - vlc
-    - the-unarchiver
+  pre_install_comment: If after finishing with xcode installation the last line says "brew -- Installing" just hit enter!
+  mandatory: true
+  type: script
+  script: /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
+git:
+  mandatory: true
+  type: brew
+  program: git
+rbenv:
+  mandatory: true
+  type: brew
+  program: rbenv
+readline:
+  mandatory: true
+  type: brew
+  program: readline
+libyaml:
+  mandatory: true
+  type: brew
+  program: libyaml
+libffi:
+  mandatory: true
+  type: brew
+  program: libffi
+node:
+  mandatory: true
+  type: brew
+  program: node
+OhMyZsh:
+  pre_install_comment: A delightful community-driven framework for managing your zsh configuration.
+  post_install_comment: Take a look at https://github.com/robbyrussell/oh-my-zsh/wiki/Plugins-Overview for plugins overview
+  mandatory: false
+  install_if_not_interactive: true
+  type: script
+  script: curl -L https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh | sh
+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
+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"
+  mandatory: false
+  install_if_not_interactive: true
+  type: brew
+  program: z
+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
+  mandatory: false
+  install_if_not_interactive: true
+  type: cask
+  program: alfred
+  post_install_command: open /Application/Alfred\ 3.app
+flycut:
+  pre_install_comment: Clean and simple clipboard manager for developers
+  mandatory: false
+  install_if_not_interactive: true
+  type: cask
+  program: flycut
+  post_install_command: open /Application/Flycut.app
+chrome:
+  mandatory: false
+  install_if_not_interactive: true
+  type: cask
+  program: google-chrome
+  post_install_command: open /Application/Google\ Chrome.app
+firefox:
+  mandatory: false
+  install_if_not_interactive: false
+  type: cask
+  program: firefox
+  post_install_command: open /Application/Firefox.app
+dropbox:
+  mandatory: false
+  install_if_not_interactive: false
+  type: cask
+  program: dropbox
+  post_install_command: open /Application/Dropbox.app
+google_drive:
+  mandatory: false
+  install_if_not_interactive: false
+  type: cask
+  program: google-drive
+  post_install_command: open /Application/Google\ Drive.app
+spectacle:
+  pre_install_comment: Window control with simple and customizable keyboard shortcuts
+  post_install_comment: "How to use: https://github.com/eczarny/spectacle#keyboard-shortcuts"
+  mandatory: false
+  install_if_not_interactive: true
+  type: cask
+  program: spectacle
+  post_install_command: open /Application/Spectacle.app
+skype:
+  mandatory: false
+  install_if_not_interactive: false
+  type: cask
+  program: skype
+  # post_install_command: open /Application/Skype.app
+atom:
+  mandatory: false
+  install_if_not_interactive: true
+  type: cask
+  program: atom
+  # post_install_command: open /Application/Atom.app
+sublime-text:
+  mandatory: false
+  install_if_not_interactive: false
+  type: cask
+  program: sublime-text
+  # post_install_command: open /Application/Sublime\ Text.app
+vlc:
+  mandatory: false
+  install_if_not_interactive: true
+  type: cask
+  program: vlc
+the-unarchiver:
+  pre_install_comment: For extracting from archives
+  mandatory: false
+  install_if_not_interactive: true
+  type: cask
+  program: the-unarchiver
+flux:
+  pre_install_comment: Flux makes the color of your computer's display adapt to the time of day, warm at night and like sunlight during the day.
+  mandatory: false
+  install_if_not_interactive: true
+  type: cask
+  program: flux
+  post_install_command: open /Application/Flux.app

data/programs/ios.yml

@@ -1,12 +1,9 @@
-brew:
-  mandatory:
-  optional:
-cask:
-  mandatory:
-  optional:
-gem:
-  mandatory:
-  optional:
-command:
-  mandatory:
-  optional:
+{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,15 +1,9 @@
-brew:
-  mandatory:
-  optional:
-cask:
-  mandatory:
-  optional:
-gem:
-  mandatory:
-  optional:
-npm:
-  mandatory:
-  optional:
-command:
-  mandatory:
-  optional:
+{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,12 +1,9 @@
-brew:
-  mandatory:
-  optional:
-cask:
-  mandatory:
-  optional:
-gem:
-  mandatory:
-  optional:
-command:
-  mandatory:
-  optional:
+{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

@@ -1,21 +1,43 @@
-brew:
-  mandatory:
-    - imagemagick
-    - node
-    - mysql
-    - postgresql
-  optional:
-cask:
-  mandatory:
-  optional:
-    - sequel-pro
-    - postico
-gem:
-  mandatory:
-  optional:
-    - bundler
-    - rails
-command:
-  mandatory:
-  optional:
-    pow: curl get.pow.cx | sh
+bundler:
+  mandatory: true
+  type: gem
+  program: bundler
+rails:
+  mandatory: true
+  type: gem
+  program: rails
+imagemagick:
+  mandatory: true
+  type: brew
+  program: imagemagick
+mysql:
+  mandatory: true
+  type: brew
+  program: mysql
+postgresql:
+  mandatory: true
+  type: brew
+  program: postgresql
+sequel-pro:
+  pre_install_comment: Sequel Pro is a fast, easy-to-use Mac database management application for working with MySQL databases.
+  mandatory: false
+  install_if_not_interactive: true
+  type: cask
+  program: sequel-pro
+postico:
+  pre_install_comment: A Modern PostgreSQL Client for the Mac
+  post_install_comment: Please ask your team lead to give you the licence for postico
+  mandatory: false
+  install_if_not_interactive: true
+  type: cask
+  program: postico
+gitkraken:
+  pre_install_comment: Modern Git GUI
+  mandatory: false
+  install_if_not_interactive: true
+  type: cask
+  program: gitkraken
+pow:
+  mandatory: true
+  type: script
+  script: curl get.pow.cx | sh

data/scripts/ruby.sh

@@ -1,5 +1,15 @@
 #!/usr/bin/env bash
 
+if ! grep -qs "rbenv init" ~/.bash_profile; then
+  echo 'export PATH="$HOME/.rbenv/bin:$PATH"' >> ~/.bash_profile
+  echo 'eval "$(rbenv init -)"' >> ~/.bash_profile
+fi
+
+if ! grep -qs "rbenv init" ~/.zshrc; then
+  echo 'export PATH="$HOME/.rbenv/bin:$PATH"' >> ~/.zshrc
+  echo 'eval "$(rbenv init -)"' >> ~/.zshrc
+fi
+
 LATEST_RUBY_VERSION=`rbenv install --list | grep -v - | tail -1 | tr -d '[[:space:]]'`
 echo "Installing Ruby $LATEST_RUBY_VERSION"
 
@@ -8,15 +18,3 @@ rbenv install $LATEST_RUBY_VERSION
 echo "Setting $LATEST_RUBY_VERSION to global"
 rbenv global $LATEST_RUBY_VERSION
 rbenv rehash
-
-if ! grep -qs "rbenv init" ~/.bashrc; then
-  echo 'export PATH="$HOME/.rbenv/bin:$PATH"' >> ~/.bashrc
-  echo 'eval "$(rbenv init -)"' >> ~/.bashrc
-  eval "$(rbenv init -)"
-fi
-
-if ! grep -qs "rbenv init" ~/.zshrc; then
-  echo 'export PATH="$HOME/.rbenv/bin:$PATH"' >> ~/.zshrc
-  echo 'eval "$(rbenv init -)"' >> ~/.zshrc
-  eval "$(rbenv init -)"
-fi

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infinum_setup
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Stjepan Hadjic
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-29 00:00:00.000000000 Z
+date: 2017-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -132,6 +132,7 @@ files:
 - lib/infinum_setup/base.rb
 - lib/infinum_setup/general.rb
 - lib/infinum_setup/install.rb
+- lib/infinum_setup/program.rb
 - lib/infinum_setup/team.rb
 - lib/infinum_setup/version.rb
 - programs/android.yml