dapp 0.0.1 → 0.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTQzOThlMTg4MDA3YzQ0MjE4ODgyZjgyMzQ4M2RiMTgzMmRlN2ZjZg==
+    NmM2YzExN2Y3YjVlZjQxOTg0MzVmM2QyMzA1YTQxMTQyNmMzZjA2NQ==
   data.tar.gz: !binary |-
-    ODQ2ODVjOTY3OTE0M2I1NzQ4MjU1ZDczODE3MTFmNDJmYTI4NDQ2OQ==
+    ZjJhNGExOThmZmE5NjU4MTFlNzhlOTkwZTE5OTY4M2NlMDVmMzk4Yw==
 SHA512:
   metadata.gz: !binary |-
-    YzU1NWRjMDAyOWNjMGRiN2RkZGQyMmFhYzhlODQwYTc1ZGJiMzI0MDJkODkw
-    Zjk5YTA2YTg1MDlmN2M0N2E5MWM1YmVhNmVmZTQ1MTlhMDRkY2IxOGI5OGQ1
-    NTRkNzU0OTU4ZDM3ZDVlNjE3Y2U1N2VhODk3ODA0NThiYTE2Yzc=
+    ZjMzMTA0YWEzYmJjYjZjMDE3NTA3NzMyYmM2NjYzNzYwODlmOTNhNzk4ZWQz
+    MTZkYTM0M2ZjYjI4OTlkYTJkMWU2ZTA1NzllNmVhMDcxNGQyMDc0MTY2NDY0
+    ZDQ2MjNhM2FiYmY4ODU2OTJiOWQ0ZWY3NjIxMjc2N2NkYjljOWY=
   data.tar.gz: !binary |-
-    ZGQ1ZTQ2ZGJmMmEwMWZjYWQ3MDYxMjg5MGNiNGQyNDc5NmQ0YWFmMWU3NmUx
-    MjkyMjllNjczNDAzMzZkYzNiY2E3YTk5MjVkODMyY2Q2NDZlMTVlMDIxZTI3
-    Y2U0YzBmNDIxOGQwYzE2N2EyMTY5MjdmZTFlYTI0NjUyZTgxMjU=
+    ODJkNjk4N2NmM2Q0ZWM1NTgxNjY1ODVkMzE1MDI1YWU5NWRkMmIyN2JjNDlk
+    MjFhOTcxODBjZWVkODQwYzliMDRkZjY5OWUzMTcxNDdmODNiNjU1ZTdmYzRj
+    ODI4ODk0OTFkNjNmMGI2NWUxODdiMGQ0N2M3M2EyMmJmNzlkZjc=

data/lib/dapp.rb

@@ -8,6 +8,7 @@ require 'mixlib/shellout'
 
 require 'dapp/version'
 require 'dapp/cli'
+require 'dapp/cli/build'
 require 'dapp/builder/chefify'
 require 'dapp/builder/centos7'
 require 'dapp/builder/cascade_tagging'

data/lib/dapp/atomizer.rb

@@ -1,9 +1,10 @@
 module Dapp
   # "Transaction" journal with rollback (mainly to protect cache fill with unbuildable configuration)
   class Atomizer
-    def initialize(builder, file_path)
+    def initialize(builder, file_path, lock_timeout: 10)
       @builder = builder
       @file_path = file_path
+      @lock_timeout = lock_timeout
       @file = open
 
       builder.register_atomizer self
@@ -11,6 +12,7 @@ module Dapp
 
     def <<(path)
       file.puts path
+      file.fsync
     end
 
     def commit!
@@ -24,6 +26,7 @@ module Dapp
     attr_reader :file_path
     attr_reader :builder
 
+    attr_reader :lock_timeout
     attr_reader :file
 
     def open
@@ -31,7 +34,7 @@ module Dapp
 
       file.sync = true
 
-      Timeout.timeout(10) do
+      Timeout.timeout(lock_timeout) do
         file.flock(File::LOCK_EX)
       end
 

data/lib/dapp/cli.rb

@@ -5,13 +5,23 @@ module Dapp
   class CLI
     include Mixlib::CLI
 
+    class << self
+      def parse_options(cli, argv)
+        cli.parse_options(argv)
+      rescue OptionParser::InvalidOption => e
+        STDERR.puts "Error: #{e.message}"
+        puts
+        puts cli.opt_parser
+        exit 1
+      end
+    end
+
     banner <<BANNER.freeze
-Version: #{Dapp::VERSION}
+Usage: dapp [options] sub-command [sub-command options]
 
-Usage:
-  dappit [options] [PATTERN ...]
+Available subcommands: (for details, dapp SUB-COMMAND --help)
 
-    PATTERN                     Applications to process [default: *].
+dapp build [options] [PATTERN ...]
 
 Options:
 BANNER
@@ -21,24 +31,9 @@ BANNER
            description: 'Show version',
            on: :tail,
            boolean: true,
-           proc: proc { puts "Version: #{Dapp::VERSION}" },
+           proc: proc { puts "dapp: #{Dapp::VERSION}" },
            exit: 0
 
-    option :quiet,
-           short: '-q',
-           long: '--quiet',
-           description: 'Suppress logging',
-           on: :tail,
-           boolean: true,
-           proc: proc { Dapp::Builder.default_opts[:log_quiet] = true }
-
-    option :verbose,
-           long: '--verbose',
-           description: 'Enable verbose output',
-           on: :tail,
-           boolean: true,
-           proc: proc { Dapp::Builder.default_opts[:log_verbose] = true }
-
     option :help,
            short: '-h',
            long: '--help',
@@ -48,85 +43,47 @@ BANNER
            show_options: true,
            exit: 0
 
-    option :build_dir,
-           long: '--build-dir PATH',
-           description: 'Build directory',
-           proc: proc { |p| Dapp::Builder.default_opts[:build_dir] = p }
-
-    option :dir,
-           long: '--dir PATH',
-           description: 'Change to directory',
-           on: :head
-
-    option :dappfile_name,
-           long: '--dappfile-name NAME',
-           description: 'Name of Dappfile',
-           proc: proc { |n| Dapp::Builder.default_opts[:dappfile_name] = n },
-           on: :head
-
-    option :flush_cache,
-           long: '--flush-cache',
-           description: 'Flush cache',
-           boolean: true,
-           proc: proc { Dapp::Builder.default_opts[:flush_cache] = true }
-
-    option :docker_registry,
-           long: '--docker-registry REGISTRY',
-           description: 'Docker registry',
-           proc: proc { |r| Dapp::Builder.default_opts[:docker_registry] = r }
-
-    option :cascade_tagging,
-           long: '--cascade_tagging',
-           description: 'Use cascade tagging',
-           boolean: true,
-           proc: proc { Dapp::Builder.default_opts[:cascade_tagging] = true }
+    def initialize(*args)
+      super(*args)
 
-    option :git_artifact_branch,
-           long: '--git-artifact-branch BRANCH',
-           description: 'Default branch to archive artifacts from',
-           proc: proc { |b| Dapp::Builder.default_opts[:git_artifact_branch] = b }
-
-    def dappfile_path
-      @dappfile_path ||= File.join [config[:dir], 'Dappfile'].compact
-    end
-
-    def patterns
-      @patterns ||= cli_arguments
+      opt_parser.program_name = 'dapp'
+      opt_parser.version = Dapp::VERSION
     end
 
-    def run(argv = ARGV)
-      begin
-        parse_options(argv)
-      rescue OptionParser::InvalidOption => e
-        STDERR.puts "Error: #{e.message}"
-        exit 1
-      end
+    SUBCOMMANDS = %w(build).freeze
 
-      patterns << '*' unless patterns.any?
-
-      if File.exist? dappfile_path
-        process_file
+    def parse_subcommand(argv)
+      if (index = argv.find_index { |v| SUBCOMMANDS.include? v })
+        return [
+          argv[0...index],
+          argv[index],
+          argv[index.next..-1]
+        ]
       else
-        process_directory
+        return [
+          argv,
+          nil,
+          []
+        ]
       end
     end
 
-    def process_file
-      patterns.each do |pattern|
-        unless Dapp::Builder.process_file(dappfile_path, app_filter: pattern).builded_apps.any?
-          STDERR.puts "Error! No such app: '#{pattern}' in #{dappfile_path}"
-          exit 1
-        end
-      end
+    def run(argv = ARGV)
+      argv, subcommand, subcommand_argv = parse_subcommand(argv)
+
+      CLI.parse_options(self, argv)
+
+      run_subcommand subcommand, subcommand_argv
     end
 
-    def process_directory
-      Dapp::Builder.default_opts[:shared_build_dir] = true
-      patterns.each do |pattern|
-        unless Dapp::Builder.process_directory(config[:dir], pattern).any?
-          STDERR.puts "Error! No such app '#{pattern}'"
-          exit 1
-        end
+    def run_subcommand(subcommand, subcommand_argv)
+      if subcommand
+        self.class.const_get(subcommand.capitalize).new.run(subcommand_argv)
+      else
+        STDERR.puts 'Error: subcommand not passed'
+        puts
+        puts opt_parser
+        exit 1
       end
     end
   end

data/lib/dapp/cli/build.rb

@@ -0,0 +1,136 @@
+require 'mixlib/cli'
+
+module Dapp
+  class CLI
+    # CLI build subcommand
+    class Build
+      include Mixlib::CLI
+
+      banner <<BANNER.freeze
+Version: #{Dapp::VERSION}
+
+Usage:
+  dapp build [options] [PATTERN ...]
+
+    PATTERN                     Applications to process [default: *].
+
+Options:
+BANNER
+
+      class << self
+        def option(name, args)
+          if args.delete :builder_opt
+            args[:proc] = if args[:boolean]
+                            proc { Dapp::Builder.default_opts[name] = true }
+                          else
+                            proc { |v| Dapp::Builder.default_opts[name] = v }
+                          end
+          end
+
+          super(name, args)
+        end
+      end
+
+      option :log_quiet,
+             short: '-q',
+             long: '--quiet',
+             description: 'Suppress logging',
+             on: :tail,
+             boolean: true,
+             builder_opt: true
+
+      option :log_verbose,
+             long: '--verbose',
+             description: 'Enable verbose output',
+             on: :tail,
+             boolean: true,
+             builder_opt: true
+
+      option :help,
+             short: '-h',
+             long: '--help',
+             description: 'Show this message',
+             on: :tail,
+             boolean: true,
+             show_options: true,
+             exit: 0
+
+      option :dir,
+             long: '--dir PATH',
+             description: 'Change to directory',
+             on: :head
+
+      option :dappfile_name,
+             long: '--dappfile-name NAME',
+             description: 'Name of Dappfile',
+             builder_opt: true,
+             on: :head
+
+      option :build_dir,
+             long: '--build-dir PATH',
+             description: 'Build directory',
+             builder_opt: true
+
+      option :docker_registry,
+             long: '--docker-registry REGISTRY',
+             description: 'Docker registry',
+             builder_opt: true
+
+      option :flush_cache,
+             long: '--flush-cache',
+             description: 'Flush cache',
+             boolean: true,
+             builder_opt: true
+
+      option :cascade_tagging,
+             long: '--cascade_tagging',
+             description: 'Use cascade tagging',
+             boolean: true,
+             builder_opt: true
+
+      option :git_artifact_branch,
+             long: '--git-artifact-branch BRANCH',
+             description: 'Default branch to archive artifacts from',
+             builder_opt: true
+
+      def dappfile_path
+        @dappfile_path ||= File.join [config[:dir], config[:dappfile_name] || 'Dappfile'].compact
+      end
+
+      def patterns
+        @patterns ||= cli_arguments
+      end
+
+      def run(argv = ARGV)
+        CLI.parse_options(self, argv)
+
+        patterns << '*' unless patterns.any?
+
+        if File.exist? dappfile_path
+          process_file
+        else
+          process_directory
+        end
+      end
+
+      def process_file
+        patterns.each do |pattern|
+          unless Dapp::Builder.process_file(dappfile_path, app_filter: pattern).builded_apps.any?
+            STDERR.puts "Error: No such app: '#{pattern}' in #{dappfile_path}"
+            exit 1
+          end
+        end
+      end
+
+      def process_directory
+        Dapp::Builder.default_opts[:shared_build_dir] = true
+        patterns.each do |pattern|
+          unless Dapp::Builder.process_directory(config[:dir], pattern).any?
+            STDERR.puts "Error: No such app '#{pattern}'"
+            exit 1
+          end
+        end
+      end
+    end
+  end
+end

data/lib/dapp/filelock.rb

@@ -12,13 +12,14 @@ module Dapp
       end
     end
 
-    def filelock(filelock, error_message: 'Already in use!', timeout: 10, &blk)
+    def filelock(filelock, error_message: 'Already in use!', timeout: 10)
       return yield if self.class.filelocks[filelock]
 
       begin
         self.class.filelocks[filelock] = true
-        filelock_lockfile(filelock, error_message: error_message, timeout: timeout, &blk)
-        yield
+        filelock_lockfile(filelock, error_message: error_message, timeout: timeout) do
+          yield
+        end
       ensure
         self.class.filelocks[filelock] = false
       end

data/lib/dapp/version.rb

@@ -1,3 +1,3 @@
 module Dapp
-  VERSION = '0.0.1'.freeze
+  VERSION = '0.0.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Dmitry Stolyarov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-12 00:00:00.000000000 Z
+date: 2016-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -99,6 +99,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.4.0
+- !ruby/object:Gem::Dependency
+  name: test_construct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -159,6 +173,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.8.2
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Build docker packaged apps using chef or shell
 email:
 - dmitry.stolyarov@flant.com
@@ -176,6 +204,7 @@ files:
 - lib/dapp/builder/centos7.rb
 - lib/dapp/builder/chefify.rb
 - lib/dapp/cli.rb
+- lib/dapp/cli/build.rb
 - lib/dapp/docker.rb
 - lib/dapp/filelock.rb
 - lib/dapp/git_artifact.rb
@@ -195,7 +224,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '2.2'
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='