reup 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a682ef14b48957b8ab43c979d69a3b25934c0251
-  data.tar.gz: c3f8da0d1d5ae9aa1b651d89f346bd002a05b97b
+  metadata.gz: 90325825af95f75e1a566aae5e5b032147489a35
+  data.tar.gz: a189400ae9b62bc9aa6ac102737621727f256742
 SHA512:
-  metadata.gz: 1aae2a1a34eec186aa73c1d8675f112b0ccfb8a8aeac9f929a74fddf8dc46c786a88056e6955b8440a206c7b74caed4a24d5504c9de7e3d8ceb3dc81d92282ce
-  data.tar.gz: 49cfa880ccfa9347102b5e5f3c251aa00ce4ad93e69fd9cbef74adfe077be9fddc932e7cce036c4b483c5be2398e9fc2d8f0941c1afe3097587626fa1b45a1eb
+  metadata.gz: 3521ac2266e80578b8623ebdc50868063e755d331fd198711f0dd9db5c231722199c20efbdff7d42bcc96c5b3d3e48b18bf63c0325d24f6d032f8e1b8f787b94
+  data.tar.gz: ae196a78a7cc899c8c710423df930d9ba692db5642ad8d22d4a93929afacdcc9eb67d73772fa2e54c8daca42da0a226d5e15d8f36c1518057caa1c5eebae9f3f

data/bin/reup

@@ -1,22 +1,45 @@
 #!/usr/bin/ruby
 
+require_relative "../lib/reup"
 require "slop"
 require "cocaine"
 
-require_relative "../lib/reup/version"
-require_relative "../lib/reup/helpers"
-
-include Reup::Helpers
+include Reup
 
 options = Slop.parse do |option|
   option.bool   "-r", "--resetdb", "resets the database"
   option.string "-b", "--branch",  "checkout branch"
+  option.bool   "-f", "--force",   "force an action"
+  option.bool   "-i", "--init",    "initialize local settings file to #{USER_SETTINGS_PATH}"
+  option.bool   "-h", "--help",    "print this dialog"
   option.on     "-v", "--version", "print the version" do
     puts Reup::VERSION
     exit
   end
 end
 
+if options.help?
+  puts options
+  exit
+end
+
+if options.init?
+  puts "Initializing user settings file..."
+  if File.exist? USER_SETTINGS_PATH
+    if options.force?
+      puts "Overwriting existing settings file..."
+      FileUtils.rm USER_SETTINGS_PATH
+    else
+      puts "The file #{USER_SETTINGS_PATH} already exists. Use --force to override."
+      exit
+    end
+  end
+  initialize_user_settings
+  puts "Local settings file initialized to #{USER_SETTINGS_PATH}"
+  exit
+end
+
+
 wasChange = detect_change_to(watch_files) do
   run "git checkout #{options[:branch]}", quiet: true if options.branch?
   run "git pull"

data/lib/reup.rb

@@ -0,0 +1,13 @@
+require_relative "reup/helpers"
+require_relative "reup/version"
+require_relative "reup/user_settings"
+require "fileutils"
+
+module Reup
+  DEFAULT_SETTINGS_PATH = File.expand_path "../reup/.reup.yaml", __FILE__
+  USER_SETTINGS_PATH    = File.expand_path ".reup.yaml", Dir.home
+end
+
+include Reup
+include Reup::Helpers
+include Reup::UserSettings

data/lib/reup/{env.yaml → .reup.yaml}

@@ -21,4 +21,5 @@ rails:
       - Gemfile
   db:
     reset_command: "bundle exec rake db:migrate:reset"
+    migrate_command: "bundle exec rake db:migrate"
 

data/lib/reup/helpers.rb

@@ -3,7 +3,8 @@ require "yaml"
 module Reup
   module Helpers
 
-    ENV_FILE = File.expand_path "../env.yaml", __FILE__
+    DEFAULT_ENV_FILE = File.expand_path "../.reup.yaml", __FILE__
+    USER_ENV_FILE    = File.expand_path ".reup.yaml", Dir.home
 
     ###########################################################################
     # Executable helpers
@@ -48,7 +49,13 @@ module Reup
     end
 
     def env_file
-      @env_file ||= YAML.load_file ENV_FILE
+      @env_file ||= (
+        if File.exist? USER_ENV_FILE
+          YAML.load_file USER_ENV_FILE
+        else
+          YAML.load_file DEFAULT_ENV_FILE
+        end
+      )
     end
 
     def watch_files

data/lib/reup/user_settings.rb

@@ -0,0 +1,7 @@
+module Reup
+  module UserSettings
+    def initialize_user_settings
+      FileUtils.cp DEFAULT_SETTINGS_PATH, USER_SETTINGS_PATH
+    end
+  end
+end

data/lib/reup/version.rb

@@ -1,3 +1,3 @@
 module Reup
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reup
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Justin Toniazzo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-18 00:00:00.000000000 Z
+date: 2015-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocaine
@@ -113,8 +113,9 @@ files:
 - bin/reup
 - bin/setup
 - lib/reup.rb
-- lib/reup/env.yaml
+- lib/reup/.reup.yaml
 - lib/reup/helpers.rb
+- lib/reup/user_settings.rb
 - lib/reup/version.rb
 - reup.gemspec
 homepage: https://github.com/jutonz/reup