reup 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 242e63186c7447f75e525c4dc024c9578e955116
-  data.tar.gz: beb387b2e21593806671723b49ae60afb4ab1cfd
+  metadata.gz: ae75d7a51da4c495b7844adecbb13e65175f3882
+  data.tar.gz: 2d2286946aaba47137cd3ff2d57166b4a70017e7
 SHA512:
-  metadata.gz: 57c9d675249d724cb080efe19b1900f5b5aa75685dda5fe207a33d9277836ded8df29521a80dba66083a64a40bb08ec20fad98e82c6a150f776612042986c0bc
-  data.tar.gz: fa4730d89ee2c8bd282e0995136cc1b91bfedc860c9add2b77d5efa41f62a6442a2f12caf3af7086bba2e4bea68cd41ff6a108b5992575bf38d9aceddd00f15d
+  metadata.gz: 955516642a57dfd4cb3d190f5773e74c08a1e289255e343163d92c427904692416f1fa73401f601d9640cec7622bde536a1b0304525234c8262913a4a8735fa7
+  data.tar.gz: 1f3f0f31e269886bf329e9111790221c1958aaafddb2660d8432efddf365388df3b5dc42918c5ab6e6d6971968d578ffd843a3dc954a77e740033187fc516636

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+*.gem

data/bin/reup

@@ -0,0 +1,31 @@
+#!/usr/bin/ruby
+
+require "slop"
+require "cocaine"
+require "byebug"
+
+require_relative "../lib/reup/version"
+require_relative "../lib/reup/helpers"
+
+include Reup::Helpers
+
+options = Slop.parse do |option|
+  option.bool   "-r", "--resetdb", "resets the database"
+  option.string "-b", "--branch",  "checkout branch"
+  option.on     "-v", "--version", "print the version" do
+    puts Reup::VERSION
+    exit
+  end
+end
+
+wasChange = detect_change_to(watch_files) do
+  run "git checkout #{options[:branch]}", quiet: true if options.branch?
+  run "git pull"
+end
+
+install if wasChange
+reset_db if options.resetdb?
+
+serve
+
+

data/lib/reup.rb

@@ -1,31 +0,0 @@
-require "slop"
-require "cocaine"
-require "byebug"
-
-require_relative "reup/version"
-require_relative "reup/helpers"
-
-include Reup::Helpers
-
-options = Slop.parse do |option|
-  option.bool   "-r", "--resetdb", "resets the database"
-  option.string "-b", "--branch",  "checkout branch"
-  option.on     "-v", "--version", "print the version" do
-    puts Reup::VERSION
-    exit
-  end
-end
-
-run "git checkout #{options[:branch]}", quiet: true if options.branch?
-run "git pull"
-
-case env
-when :rails
-  run "bundle"
-  run "rake db:migrate:reset" if options.resetdb?
-when :ember
-  run "npm install"
-end
-
-serve
-

data/lib/reup/env.yaml

@@ -0,0 +1,24 @@
+--- 
+ember: 
+  indicator_files: 
+    - ember-cli-build.js
+  serve:
+    command: "ember server"
+  install: 
+    command: "npm install"
+    only_if_changed: 
+      - bower.json
+      - package.json
+      - ember-cli-build.js
+rails: 
+  indicator_files: 
+    - Gemfile
+  serve:
+    command: "bundle exec foreman start"
+  install: 
+    command: bundle
+    only_if_changed: 
+      - Gemfile
+  db:
+    reset_command: "bundle exec rake db:migrate:reset"
+

data/lib/reup/helpers.rb

@@ -1,6 +1,16 @@
+require "yaml"
+
 module Reup
   module Helpers
+
+    ENV_FILE = File.expand_path "../env.yaml", __FILE__
+
+    ###########################################################################
+    # Executable helpers
+    ###########################################################################
+
     def run(command, quiet: false, print_command: true, replace_process: false)
+      return unless command
       puts command if print_command
       command += " &>/dev/null" if quiet
 
@@ -15,29 +25,86 @@ module Reup
       cmd = Cocaine::CommandLine.new(command)
       result = cmd.run
       puts result unless quiet
+      result
     end
 
     def kernel_run(command)
       Kernel.exec command
     end
 
-    def serve
-      serve_command =
-        case env
-        when :rails then "bundle exec foreman start"
-        when :ember then "ember server"
-        end
+    def detect_change_to(files, &block)
+      before = files.map { |f| last_modified(f) }
+      yield
+      after  = files.map { |f| last_modified(f) }
+      before != after # Not equal means there was a change
+    end
 
-      run(serve_command, replace_process: true)
+    ###########################################################################
+    # Environment helpers
+    ###########################################################################
+
+    def last_modified(file)
+      File.mtime file
+    end
+
+    def env_file
+      @env_file ||= YAML.load_file ENV_FILE
+    end
+
+    def watch_files
+      @watch_files ||= Array(env_file[env]["install"]["only_if_changed"])
+    end
+
+    def install_command
+      @install_command ||= env_file[env]["install"]["command"]
+    end
+
+    def serve_command
+      @serve_command ||= env_file[env]["serve"]["command"]
+    end
+
+    def reset_db_command
+      @reset_db_command ||= (
+        db_section = env_file[env]["db"]
+        if db_section
+          db_section["reset_command"]
+        else
+          nil
+        end
+      )
     end
 
     def env
       @env ||= (
-        env = :rails if File.exist? "Procfile"
-        env = :ember if File.exist? "ember-cli-build.js"
+        possible_envs = env_file.keys
+        env = nil
+        possible_envs.each do |possible|
+          indicator_files = Array(env_file[possible]["indicator_files"])
+          if indicator_files.any? { |f| File.exist? f }
+            env = possible
+            break
+          end
+        end
+        raise "You don't appear to be in a supported environment" unless env
         env
       )
     end
 
+    ###########################################################################
+    # API methods
+    ###########################################################################
+
+    def install(args = {})
+      run install_command, args
+    end
+
+    def reset_db(args = {})
+      run reset_db_command, args
+    end
+
+    def serve
+      run(serve_command, replace_process: true)
+    end
+
   end
 end

data/lib/reup/version.rb

@@ -1,3 +1,3 @@
 module Reup
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reup
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Justin Toniazzo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-09-02 00:00:00.000000000 Z
+date: 2015-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocaine
@@ -109,8 +109,10 @@ files:
 - README.md
 - Rakefile
 - bin/console
+- bin/reup
 - bin/setup
 - lib/reup.rb
+- lib/reup/env.yaml
 - lib/reup/helpers.rb
 - lib/reup/version.rb
 - reup.gemspec