dply 0.2.19 → 0.3.0

data/lib/dply/build_config.rb

@@ -1,101 +1,33 @@
-require 'ostruct'
-require 'dply/helper'
+require 'dply/base_config'
 
 module Dply
-  class BuildConfig
-
-    include Helper
-
-    def initialize(dir: nil, read_config: true)
-      @read_config = read_config
-      @dir = (dir || Dir.pwd)
+  class BuildConfig < BaseConfig
+    define_opts do
+      opt :dir
+      opt :task
+      opt :branch
+      opt :repo
+      opt :mirror
+      opt :git
+      opt :no_pull
+      opt :revision
+      opt :config_map, type: Hash
+      opt :dir_map, type: Hash
+      opt :shared_dirs, type: Array
+      opt :config_download_url
+      opt :config_skip_download, type: Array
+    end
+
+    def default_config
+      dir Dir.pwd
+      git true
+      task :build
+      branch "master"
+      shared_dirs []
+      dir_map({
+        "tmp" => "tmp",
+        "log" => "log"
+      })
     end
-
-    def config
-      return @config if @config
-      @config = {
-        dir: @dir,
-        task: "app:build",
-        branch: :master,
-        repo: nil,
-        git: true,
-        env: {},
-        config_map: nil,
-        dir_map: nil,
-        shared_dirs: [],
-        config_skip_download: [],
-        config_download_url: nil
-      }
-      read_from_file if @read_config
-      return @config
-    end
-
-    def branch(branch)
-      set :branch, branch
-    end
-
-    def task(task)
-      set :task, task
-    end
-
-    def repo(repo)
-      set :repo, repo
-    end
-
-    def config_map(map)
-      set :config_map, map
-    end
-
-    def config_skip_download(list)
-      set :config_skip_download, list
-    end
-
-    def config_download_url(url)
-      set :config_download_url, url
-    end
-
-    def dir_map(map)
-      set :dir_map, map
-    end
-
-    def set_env(key, value)
-      @config[:env].store key, value
-    end
-
-    def set(key, value)
-      @config.store key, value
-    end
-
-    def to_struct
-      OpenStruct.new(config)
-    end
-
-    def env(h)
-      raise if not h.is_a? Hash
-      @config[:env] = h
-      @config[:env].each do |k,v|
-        ENV[k.to_s] = v.to_s
-      end
-    end
-
-    def config_file
-      @config_file ||= "#{@dir}/build.rb"
-    end
-
-    def shared_dirs(dirs)
-      raise if not dirs.is_a? Array
-      @config[:shared_dirs] = dirs
-    end
-
-    def read_from_file
-      if not File.readable? config_file
-        error "build.rb not found in #{@dir}"
-        return
-      end
-      instance_eval(File.read(config_file), config_file)
-    rescue NoMethodError => e
-      error "invalid option used in config: #{e.name}"
-    end
-
   end
 end

data/lib/dply/bundle.rb

@@ -1,7 +1,6 @@
 require 'dply/helper'
 require 'fileutils'
 require 'yaml'
-require 'shellwords'
 
 module Dply
   class Bundle
@@ -9,26 +8,22 @@ module Dply
     include Helper
 
     def install
-      init
+      return if not gemfile_exists?
+      write_config
       return if check
       cmd "bundle install -j5 --deployment"
     end
 
-    def rake(task)
-      rakelib = Shellwords.shellescape "#{__dir__}/rakelib"
-      rake_cmd = %(rake -R #{rakelib} -Nf dply/Rakefile #{task})
-      command = gemfile_exists? ? "bundle exec #{rake_cmd}" : rake_cmd
-      cmd command, env: env, display: false
-    end
-
     def clean
+      return if not gemfile_exists?
+      write_config
       cmd "bundle clean"
     end
 
     private
 
-    def init
-      @init ||= begin
+    def write_config
+      @write_config ||= begin
         h = {
           "BUNDLE_PATH" => "vendor/bundle",
           "BUNDLE_FROZEN" => "1",
@@ -43,26 +38,8 @@ module Dply
       system "bundle check > /dev/null"
     end
 
-    def env
-      @env ||= begin
-        env = {}
-        env.merge! env_from_yml(".env.yml")
-        env.merge! env_from_yml("config/env.yml")
-        env
-      end
-    end
-
-    def env_from_yml(path)
-      if not File.readable? path
-        logger.debug "skipped loading env from #{path}"
-        return {}
-      end
-      require 'yaml'
-      YAML.load_file(path)
-    end
-
     def gemfile_exists?
-      File.exists? "Gemfile"
+      File.exist? "Gemfile"
     end
 
   end

data/lib/dply/cli/build.rb

@@ -24,41 +24,34 @@ module Dply
       end
 
       def config
-        @config ||= ::Dply::BuildConfig.new.to_struct
-      end
-
-      def dir
-        @dir ||= Dir.pwd
+        @config ||= BuildConfig.build("#{Dir.pwd}/build.rb")
       end
 
       def lock
-        @lock ||= ::Dply::Lock.new
+        @lock ||= Lock.new(Dir.pwd)
       end
 
       def opts
         OptionParser.new do |opts|
 
           opts.banner = "Usage: drake build [options] [target]"
-          
+
           opts.on("-b", "--branch [BRANCH]" , "Specify git branch") do |b|
             config.branch = b
           end
 
           opts.on("-r", "--revision [REVISION]", "Specify revision") do |r|
             config.revision = r
+            ENV["BUILD_NUMBER"] = r.to_s
           end
 
           opts.on("--no-pull", "Enable/disable git pull") do |e|
             config.no_pull = true
           end
 
-          opts.on("--use-yum", "use yum to install packages") do |e|
-            config.use_yum = true
-          end
-
           opts.on("--skip-git", "Disable git") do |e|
             config.git = false
-          end  
+          end
 
           opts.on("-h", "--help", "Help") do
             puts opts

data/lib/dply/cli/ctl.rb

@@ -1,7 +1,7 @@
 require 'dply/lock'
 require 'dply/strategy'
-require 'dply/config'
-require 'dply/tasks'
+require 'dply/deploy_config'
+require 'dply/util'
 
 module Dply
   module Cli
@@ -10,9 +10,8 @@ module Dply
       def run(command)
         case command
         when :start, :stop, :reopen_logs
-          config
           lock.acquire
-          Dir.chdir("current") { tasks.send command.to_sym }
+          Dir.chdir("current") { util.run command }
         when :reload
           lock.acquire
           strategy.reload
@@ -24,15 +23,15 @@ module Dply
       end
 
       def config
-        @config ||= Config.new.to_struct
+        @config ||= DeployConfig.build("#{Dir.pwd}/deploy.rb")
       end
 
       def lock
-        @lock ||= Lock.new
+        @lock ||= Lock.new(Dir.pwd)
       end
 
-      def tasks
-        @tasks ||= ::Dply::Tasks.new
+      def util
+        @util ||= ::Dply::Util.new
       end
 
     end

data/lib/dply/cli/deploy.rb

@@ -1,7 +1,7 @@
 require 'dply/strategy'
 require 'dply/logger'
 require 'dply/lock'
-require 'dply/config'
+require 'dply/deploy_config'
 
 module Dply
   module Cli
@@ -26,18 +26,18 @@ module Dply
       end
 
       def lock
-        @lock ||= Lock.new
+        @lock ||= Lock.new(Dir.pwd)
       end
 
       def config
-       @config ||= Config.new.to_struct 
+       @config ||= DeployConfig.build("#{Dir.pwd}/deploy.rb")
       end
 
       def opts
         OptionParser.new do |opts|
 
           opts.banner = "Usage: dply deploy [options] [target]"
-          
+
           opts.on("-b", "--branch [BRANCH]" , "Specify git branch") do |b|
             config.branch = b
           end
@@ -52,14 +52,10 @@ module Dply
 
           opts.on("--skip-git", "Disable git") do |e|
             options[:skip_git] = true
-          end  
-          
-          opts.on("--skip-bundler", "Skip bundle install") do |e|
-            options[:skip_bundler] = true
           end
 
-          opts.on("--use-yum", "use yum to install packages") do |e|
-            options[:use_yum] = true
+          opts.on("--skip-bundler", "Skip bundle install") do |e|
+            options[:skip_bundler] = true
           end
 
           opts.on("-h", "--help", "Help") do

data/lib/dply/cli/devbuild.rb

@@ -1,6 +1,6 @@
 require 'dply/logger'
 require 'dply/lock'
-require 'dply/tasks'
+require 'dply/util'
 require 'fileutils'
 
 module Dply
@@ -24,18 +24,18 @@ module Dply
         FileUtils.mkdir_p build_artifacts
 
         clear_bundle_config
-        tasks.install_pkgs(build_mode: true, use_yum: @options[:use_yum])
-        tasks.build "app:build"
+        util.install_pkgs(build_mode: true)
+        util.run :build
       ensure
         clear_bundle_config
       end
 
-      def tasks
-        @tasks ||= ::Dply::Tasks.new
+      def util
+        @util ||= ::Dply::Util.new
       end
 
       def lock
-        @lock ||= ::Dply::Lock.new
+        @lock ||= Lock.new(Dir.pwd)
       end
 
       def clear_bundle_config
@@ -51,10 +51,6 @@ module Dply
             @options[:revision] = r
           end
 
-          opts.on("--use-yum", "use yum to install packages") do |e|
-            @options[:use_yum] = true
-          end
-
           opts.on("-h", "--help", "Help") do
             puts opts
             exit

data/lib/dply/cli/install_pkgs.rb

@@ -15,7 +15,7 @@ module Dply
       def run
         opts.parse!(@argv)
         error "pkgs.yml cannot be a symlink" if File.symlink? "pkgs.yml"
-        pkgs = Pkgs.new
+        pkgs = Pkgs.new("pkgs.yml")
         pkgs.install(build_mode: @options[:build_mode])
         puts "installed"
       end
@@ -24,7 +24,7 @@ module Dply
         OptionParser.new do |opts|
 
           opts.banner = "Usage: drake install-pkgs [options] [target]"
-          
+
           opts.on("-b" , "Build mode") do |b|
             @options[:build_mode] = true
           end
@@ -36,7 +36,6 @@ module Dply
         end
       end
 
-
     end
   end
 end

data/lib/dply/cli/run.rb

@@ -0,0 +1,27 @@
+require 'dply/logger'
+require 'dply/lock'
+require 'dply/app_config'
+
+module Dply
+  module Cli
+    class Run
+
+      include Logger
+
+      def initialize(argv)
+        @argv = argv
+      end
+
+      def run
+        lock.acquire
+        app_config = AppConfig.new
+        app_config.run_task @argv.shift
+      end
+
+      def lock
+        @lock ||= Lock.new(Dir.pwd)
+      end
+
+    end
+  end
+end

data/lib/dply/cli/status.rb

@@ -1,6 +1,5 @@
 require 'dply/logger'
 require 'dply/release_helper'
-require 'dply/config'
 
 module Dply
   module Cli
@@ -19,7 +18,7 @@ module Dply
       def print_status
         r = current_release
         color = r[:deployed] ? :green : :red
-        logger.info "#{r[:revision].send color} #{r[:project]} #{r[:branch]} #{r[:timestamp]}" 
+        logger.info "#{r[:revision].send color} #{r[:project]} #{r[:branch]} #{r[:timestamp]}"
       end
 
       def current_release

data/lib/dply/cli/task.rb

@@ -1,7 +1,6 @@
 require 'dply/logger'
 require 'dply/lock'
-require 'dply/strategy'
-require 'dply/config'
+require 'dply/app_config'
 
 module Dply
   module Cli
@@ -17,19 +16,14 @@ module Dply
         task_name = @argv.shift
         error "task name not specified" if not task_name
         lock.acquire
-        strategy.task(task_name)
-      end
-
-      def strategy
-        @strategy ||= Strategy.load(config, {})
-      end
-
-      def config
-        @config ||= Config.new.to_struct
+        Dir.chdir "current" do
+          app_config = AppConfig.new
+          app_config.run_task task_name
+        end
       end
 
       def lock
-        @lock ||= Lock.new
+        @lock ||= Lock.new(Dir.pwd)
       end
 
     end