zeta 0.2.2 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63a82870a90c693bb9e34ba0ce55aff5372166c6
-  data.tar.gz: a78e671775bc0677bdb678a3ddd4e60377471082
+  metadata.gz: 332c4c04e173a5ca9b3e1735e865c0b396791076
+  data.tar.gz: 2e55416065c24e91fa7317a65da8f98d4025353b
 SHA512:
-  metadata.gz: 7b08be9309a27352425d7fc8e1146746d538d18f019046d4585664d649fdeb7784e37432cd7f0d1615677227c656dc642b7a63790689465664a31c7b827b9925
-  data.tar.gz: 5c521252594b5344c7cd21b3649fe5f3ccafc487118e51ad515a571bac04c18a00ae97782d7ee617cfc482acafdf069b72701adb8e54b54dab8895fd8db677da
+  metadata.gz: 2fa4f37b8b19938103f9cf33233475684b756eb8b3d72a2d53a97b95ea1a2114c0dbe0ad5f8dad4808c25ce77a829c4f89172265757fd04d4b3e512de3681d9c
+  data.tar.gz: 2b25dd75a9bf73dfc5e87129ae5b5560428cdc4967218f34bdfc2e33d56eeae686fd059aa82885827de543a11bedc805975b03510345efe8c3d9d2c0abce7499

data/CHANGELOG.markdown

@@ -1,2 +1,9 @@
+# 0.2.5 (28-Oct-15)
+- better CLI help
+- update lacerda version
+
+# 0.2.3 (22-Oct-15)
+-  log urls of downloaded service files
+
 # 0.1.2 (20-Oct-15)
 - add `zeta` runner

data/README.md

@@ -1,8 +1,7 @@
-[![Circle CI](https://circleci.com/gh/moviepilot/zeta.svg?style=svg)](https://circleci.com/gh/moviepilot/zeta) [![Coverage Status](https://coveralls.io/repos/moviepilot/zeta/badge.svg?branch=master&service=github)](https://coveralls.io/github/moviepilot/zeta?branch=master) [![Code Climate](https://codeclimate.com/github/moviepilot/zeta/badges/gpa.svg)](https://codeclimate.com/github/moviepilot/zeta)
+# Zeta [![Circle CI](https://circleci.com/gh/moviepilot/zeta.svg?style=svg)](https://circleci.com/gh/moviepilot/zeta) [![Coverage Status](https://coveralls.io/repos/moviepilot/zeta/badge.svg?branch=master&service=github)](https://coveralls.io/github/moviepilot/zeta?branch=master) [![Code Climate](https://codeclimate.com/github/moviepilot/zeta/badges/gpa.svg)](https://codeclimate.com/github/moviepilot/zeta) [![Dependency Status](https://gemnasium.com/moviepilot/zeta.svg)](https://gemnasium.com/moviepilot/zeta)
 
 ![](https://dl.dropboxusercontent.com/u/1953503/zeta.jpg)
 
-# Old Maid
 
 ```
 TLDR:
@@ -10,14 +9,14 @@ TLDR:
 - these contracts are formatted in human readable markdown
 - you never have to know/care about other services or repositories
 
-Old Maid will:
+Zeta will:
 - know the rest of your infrastructure and fetches the contracts of all other services
 - alert you if your change in service X breaks service Y
 ```
 
-In an infrastructure where many services are talking with each other, it's sometimes hard to know **how changes in one service affect other services**, as each project often just knows about itself. Even if local tests pass, you can't know what other services might be affected when you make changes to a service.
+In an infrastructure where many services are talking with each other, it's sometimes hard to know **how changes in one service affect other services**, as each service often just knows about itself. Even if local tests pass, you can't know what other services might be affected when you make changes to a service.
 
-*Old Maid* tackles this problem by allowing each service to define which objects it consumes, and which objects it publishes - in simple Markdown (specifically [MSON](https://github.com/apiaryio/mson)).It doesn't matter if these objected are transported via a HTTP, a message broker like RabbitMQ or any other mean.
+*Zeta* tackles this problem by allowing each service to define which objects it consumes, and which objects it publishes - in simple Markdown (specifically [MSON](https://github.com/apiaryio/mson)).It doesn't matter if these objected are transported via a HTTP, a message broker like RabbitMQ or any other mean.
 
 
 ## Walk this way
@@ -39,7 +38,7 @@ Wouldn't it be nice of some test local to the **MessageService** repository to t
 
 ## Yes, it would!
 
-Each project have to contain two files in order for *Old Maid* to do its job:
+Each service has to contain two files in order for *Zeta* to do its job:
 
 1. `contracts/publish.mson`
 2. `contracts/consume.mson`
@@ -85,7 +84,7 @@ As you can see, this consumer expects the `recipient_id` property to be present
 ## Getting started
 
 ### 1. Installation
-First, add *Old Maid* to your `Gemfile` or install manually:
+First, add *Zeta* to your `Gemfile` or install manually:
 
 ```shell
 $ gem install zeta
@@ -93,7 +92,7 @@ $ gem install zeta
 
 ### 2. Configuration
 
-If you're using ruby on rails, *Old Maid* will automatically know your
+If you're using ruby on rails, *Zeta* will automatically know your
 environment and look for its configuration in `config/zeta.yml`, which could look like this:
 
 ```yaml
@@ -105,15 +104,15 @@ common: &common
   # Which directory contains the publish.mson and consume.mson
   contracts_path: contracts
 
-  # Where to cache the contracts from all other projects that are part of the
-  # infrastructure. Old Maid will fetch these for you.
+  # Where to cache the contracts from all other services that are part of the
+  # infrastructure. Zeta will fetch these for you.
   contracts_cache_path: contracts/.cache
 
 
 development:
   <<: *common
   # The services file contains all services that are part of your infrastructure
-  # and tested with Old Maid. It's just another yaml file, but the nice thing is
+  # and tested with Zeta. It's just another yaml file, but the nice thing is
   # that it's outside of the service's repository and has to be maintained only
   # in one place.
   services_file:
@@ -136,7 +135,7 @@ production:
 
 ```
 
-You typically just create the above file once and then don't touch it anymore. If that file is in a private repository (that would be a good idea), make sure you `export GITHUB_USERNAME=youruser` and `GITHUB_TOKEN=yourtoken` and *Old Maid* will use that.
+You typically just create the above file once and then don't touch it anymore. If that file is in a private repository (that would be a good idea), make sure you `export GITHUB_USER=youruser` and `GITHUB_TOKEN=yourtoken` and *Zeta* will use that.
 
 Here's how `github.com/jensmander/zeta-config/infrastructure/master.yml` might look in our example above:
 
@@ -176,7 +175,7 @@ Common options:
     -v, --version                    Show version
 ```
 
-Example time. You can tell *Old Maid* to validate the whole infrastructure like this:
+Example time. You can tell *Zeta* to validate the whole infrastructure like this:
 
 ```shell
 $ zeta -e development full_check
@@ -185,7 +184,7 @@ $ zeta -e development full_check
 The above command performs the following three steps:
 
 1. Fetch all contracts from remote repositories and put them into the cache directory configured above
-2. Copy the current projects contracts (that you might have changed) into the cache directory
+2. Copy the current services contracts (that you might have changed) into the cache directory
 3. Validate all contracts (i.e. make sure that every publishing service satisfies its consumers)
 
 The above commands can also be run in isolation:

data/Rakefile

@@ -1,2 +1,2 @@
 require "bundler/gem_tasks"
-require "minimum-term/tasks"
+require "lacerda/tasks"

data/lib/zeta/instance.rb

@@ -2,7 +2,7 @@ require 'active_support/core_ext/hash/indifferent_access'
 require 'yaml'
 require 'fileutils'
 require 'tmpdir'
-require 'minimum-term'
+require 'lacerda'
 
 require 'zeta/local_or_remote_file'
 
@@ -48,7 +48,7 @@ class Zeta
     def infrastructure
       @mutex.synchronize do
         return @infrastructure if @infrastructure
-        @infrastructure = MinimumTerm::Infrastructure.new(data_dir: cache_dir, verbose: verbose?)
+        @infrastructure = Lacerda::Infrastructure.new(data_dir: cache_dir, verbose: verbose?)
         @infrastructure
       end
     end
@@ -131,7 +131,7 @@ class Zeta
       if config[:services]
         return config[:services]
       elsif config[:services_file]
-        file = LocalOrRemoteFile.new(config[:services_file].merge(debug: verbose?))
+        file = LocalOrRemoteFile.new(config[:services_file].merge(verbose: verbose?))
         services = YAML.load(file.read)
         begin
           services.with_indifferent_access

data/lib/zeta/runner.rb

@@ -2,15 +2,31 @@
 require 'optparse'
 
 class Zeta::Runner
-  COMMANDS = %w{full_check fetch_remote_contracts update_own_contracts validate}
+  COMMANDS = {
+    'full_check'             => 'Update contracts and validate infrastructure',
+    'validate'               => 'Validate the architecture in the contracts cache dir',
+    'update_own_contracts'   => 'Update your own contracts in the contracts cache dir',
+    'fetch_remote_contracts' => 'Download remote contracts and update your own contracts in the contracts cache dir'
+  }
 
   def self.run
     options = {}
     parser = OptionParser.new do |opts|
-      opts.banner = "Usage: zeta [options] #{COMMANDS.join('|')}"
+      opts.banner = "#{'Usage:'.red} zeta [options] command"
 
       opts.separator ""
-      opts.separator "Specific options:"
+      opts.separator "Commands:".yellow
+
+      longest_command = COMMANDS.keys.map(&:length).sort.last + 1
+      command_list = []
+      COMMANDS.each do |cmd, desc|
+        padded_cmd = "#{cmd}:".ljust(longest_command, " ")
+        command_list << "    #{padded_cmd} #{desc}"
+      end
+      opts.separator command_list
+
+      opts.separator ""
+      opts.separator "Specific options:".yellow
 
       opts.on("-c CONFIG_FILE", "--config=CONFIG_FILE", "Config file (default: config/zeta.yml)") do |c|
         options[:config_file] = c
@@ -25,7 +41,7 @@ class Zeta::Runner
       end
 
       opts.separator ""
-      opts.separator "Common options:"
+      opts.separator "Common options:".yellow
 
       opts.on_tail("-h", "--help", "Show this message") do
         puts opts
@@ -41,7 +57,7 @@ class Zeta::Runner
     parser.parse!
 
     commands = ARGV
-    if commands.empty? or !(commands-COMMANDS).empty?
+    if commands.empty? or !(commands-COMMANDS.keys).empty?
       puts parser
       exit(-1)
     end
@@ -66,7 +82,7 @@ class Zeta::Runner
         zeta.contracts_fulfilled?
         unless zeta.errors.empty?
           puts JSON.pretty_generate(zeta.errors)
-          puts "#{zeta.errors.length} invalid contracts".red
+          puts "#{zeta.errors.length} contract violations".red
           exit(-1)
         end
         puts "All contracts valid 🙌".green if options[:verbose]

data/lib/zeta/version.rb

@@ -1,3 +1,3 @@
 class Zeta
-  VERSION = "0.2.2"
+  VERSION = "0.2.5"
 end

data/lib/zeta.rb

@@ -13,7 +13,7 @@ class Zeta
     define_singleton_method method do |*args|
       send_args = [method, args].flatten.compact
       MUTEX.synchronize do
-        @singleton ||= new
+        @singleton ||= new(verbose: true)
         @singleton.send(*send_args)
       end
     end

data/zeta.gemspec

@@ -19,8 +19,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'rake', '~> 10.2'
-  spec.add_runtime_dependency 'minimum-term', '~> 0.2'
-  spec.add_runtime_dependency 'activesupport', '~> 4.2'
+  spec.add_runtime_dependency 'lacerda', '~> 0.3.2'
+  spec.add_runtime_dependency 'activesupport'
   spec.add_runtime_dependency 'httparty', '~> 0.13'
   spec.add_runtime_dependency 'colorize'
   spec.add_runtime_dependency 'webmock'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zeta
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.5
 platform: ruby
 authors:
 - Jannis Hermanns
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-22 00:00:00.000000000 Z
+date: 2015-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -25,33 +25,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.2'
 - !ruby/object:Gem::Dependency
-  name: minimum-term
+  name: lacerda
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
@@ -168,16 +168,11 @@ files:
 - Rakefile
 - bin/zeta
 - circle.yml
-- contracts/cache/service_1/consume.mson
-- contracts/cache/service_1/publish.mson
-- contracts/cache/service_2/consume.mson
-- contracts/cache/service_2/publish.mson
 - lib/zeta.rb
 - lib/zeta/instance.rb
 - lib/zeta/local_or_remote_file.rb
 - lib/zeta/runner.rb
 - lib/zeta/version.rb
-- todo.txt
 - zeta.gemspec
 homepage: https://github.com/moviepilot/zeta
 licenses: []

data/contracts/cache/service_1/consume.mson

@@ -1 +0,0 @@
-Some MSON

data/contracts/cache/service_1/publish.mson

@@ -1 +0,0 @@
-Some MSON

data/contracts/cache/service_2/consume.mson

@@ -1 +0,0 @@
-Some MSON

data/contracts/cache/service_2/publish.mson

@@ -1 +0,0 @@
-Some MSON

data/todo.txt

@@ -1,4 +0,0 @@
-- invalid primitives
-- 404 should report url
-- default primitive is object
--