digicert-cli 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d13e89e28e79c3ef86c16826f44fa8a4961a2c53a7a2b08f2712718ed0d8d858
-  data.tar.gz: d47dff6e93dc14640bc9b23f198a08d83034181f678b557945a3f8e923d4128e
+  metadata.gz: 1abbf50c6b8d9282270e6a7d0ac3612697960bad830a6e501e69f79a083a6306
+  data.tar.gz: a514f1d0cb523933312bae6ba79271ecda52037ef2f2cfb280ecda7e59c67dfb
 SHA512:
-  metadata.gz: 75cd2efd9cdae693ad8e737b8fe26dbe84d68d838b73e67c4434febc6620b000402efe5f3aada8e685d1218aa3bd415fd4b1d7da241ed28458b7cd3681233459
-  data.tar.gz: 02e2b749a8027287a92f772f9fdd0e8d75951049a65d510c3479e5a68f83d434a1142aeecfc7ff877d91525d7308cf96747cd14a5da1713ead4a79f46477f563
+  metadata.gz: f629804e272191fd80d25fa901d8bb7aac958f2d7cf71589081b8e16cf5271916eb3d6d24362f6d0b766cf3e970af342255c559352548c61415c63c612ad203f
+  data.tar.gz: 8bd04d42035fe1acce5871813e23e8b085f23e415303ace19261787522dad5c7e9673215eb1e94fee637331d1a56f88ca9cce30ad19e24d9ea2d26f14f36ad81

data/.rubocop.yml

@@ -1,9 +1,4 @@
 AllCops:
-  Include:
-    - "**/*.rake"
-    - "**/Gemfile"
-    - "**/Rakefile"
-
   Exclude:
     - db/schema.rb
 
@@ -357,8 +352,18 @@ Style/TrailingCommaInArguments:
     - no_comma
   Enabled: true
 
-Style/TrailingCommaInLiteral:
-  Description: 'Checks for trailing comma in array and hash literals.'
+Style/TrailingCommaInArrayLiteral:
+  Description: 'Checks for trailing comma in array literals.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-trailing-array-commas'
+  EnforcedStyleForMultiline: comma
+  SupportedStylesForMultiline:
+    - comma
+    - consistent_comma
+    - no_comma
+  Enabled: true
+
+Style/TrailingCommaInHashLiteral:
+  Description: 'Checks for trailing comma in hash literals.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-trailing-array-commas'
   EnforcedStyleForMultiline: comma
   SupportedStylesForMultiline:
@@ -403,6 +408,13 @@ Layout/AlignParameters:
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-double-indent'
   Enabled: false
 
+Layout/ConditionPosition:
+  Description: >-
+                 Checks for condition placed in a confusing position relative to
+                 the keyword.
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#same-line-condition'
+  Enabled: false
+
 Layout/DotPosition:
   Description: 'Checks the position of the dot in multi-line method calls.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#consistent-multi-line-chains'
@@ -455,13 +467,6 @@ Lint/CircularArgumentReference:
   Description: "Don't refer to the keyword argument in the default value."
   Enabled: false
 
-Lint/ConditionPosition:
-  Description: >-
-                 Checks for condition placed in a confusing position relative to
-                 the keyword.
-  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#same-line-condition'
-  Enabled: false
-
 Lint/DeprecatedClassMethods:
   Description: 'Check for deprecated class method calls.'
   Enabled: false
@@ -487,7 +492,7 @@ Lint/HandleExceptions:
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#dont-hide-exceptions'
   Enabled: false
 
-Lint/LiteralInCondition:
+Lint/LiteralAsCondition:
   Description: 'Checks of literals used in conditions.'
   Enabled: false
 
@@ -528,7 +533,7 @@ Lint/UnderscorePrefixedVariableName:
   Description: 'Do not use prefix `_` for a variable that is used.'
   Enabled: false
 
-Lint/UnneededDisable:
+Lint/UnneededCopDisableDirective:
   Description: >-
                  Checks for rubocop:disable comments that can be removed.
                  Note: this cop is not disabled when disabling all cops.

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.5.0 (2019-03-14)
+
+* Change CSR's Order Id to be optional
+* Add `--debug` flag with CLI commands
+* Add order duplication support in CLI
+* Add `order create` interface in the gem
+
 ## 0.4.1 (2018-07-18)
 
 * Upgrade `digicert` gem to latest version

data/Gemfile

@@ -2,3 +2,6 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in digicert-cli.gemspec
 gemspec
+
+# Temporary until there is a new release
+gem "digicert", github: "riboseinc/digicert", ref: "9d2915d"

data/digicert-cli.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.executables   = "digicert"
 
   spec.add_dependency "thor", "~> 0.19.4"
-  spec.add_dependency "digicert", "~> 0.3.1"
+  spec.add_dependency "digicert", "~> 0.4.0"
   spec.add_dependency "openssl", ">= 2.0.3"
   spec.add_dependency "terminal-table"
 
@@ -29,4 +29,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "webmock", "~> 2.0"
+  spec.add_development_dependency "pry", "~> 0.11.3"
 end

data/lib/digicert/cli.rb

@@ -32,7 +32,7 @@ require "digicert/cli/command"
 module Digicert
   module CLI
     def self.start(arguments)
-      Digicert::CLI::Command.start(arguments)
+      Digicert::CLI::Util.run(arguments)
     rescue Digicert::Errors::Forbidden, NoMethodError
       Thor::Shell::Basic.new.say(
         "Invalid: Missing API KEY\n\n" \

data/lib/digicert/cli/commands/certificate.rb

@@ -4,6 +4,8 @@ module Digicert
   module CLI
     module Commands
       class Certificate < Thor
+        class_option :debug, type: "boolean", desc: "Enable debug mode"
+
         desc "fetch ORDER_ID", "Find an order's certificate"
         option :quiet, type: :boolean, aliases: "-q", desc: "Retrieve only id"
         option :output, aliases: "-o", desc: "Path to download the certificate"

data/lib/digicert/cli/commands/csr.rb

@@ -4,17 +4,19 @@ module Digicert
   module CLI
     module Commands
       class Csr < Thor
-        desc "fetch ORDER_ID", "Fetch an existing CSR"
+        class_option :debug, type: "boolean", desc: "Enable debug mode"
 
+        desc "fetch ORDER_ID", "Fetch an existing CSR"
         def fetch(order_id)
           say(csr_instance(order_id: order_id).fetch)
         end
 
         desc "generate", "Generate certificate CSR"
+        option :order_id, aliases: "-o", desc: "An Order ID"
         option :common_name, aliases: "-c", desc: "The common name"
+        option :organization_id, desc: "Your digicert's organization ID"
         option :san, type: :array, desc: "The subject alternative names"
         option :key, aliases: "-k", desc: "Complete path to the rsa key file"
-        option :order_id, required: true, aliases: "-o", desc: "An Order ID"
 
         def generate
           say(csr_instance.generate)

data/lib/digicert/cli/commands/order.rb

@@ -1,10 +1,14 @@
 require "digicert/cli/order"
 require "digicert/cli/order_reissuer"
+require "digicert/cli/order_creator"
+require "digicert/cli/order_duplicator"
 
 module Digicert
   module CLI
     module Commands
       class Order < Thor
+        class_option :debug, type: "boolean", desc: "Enable debug mode"
+
         desc "list", "List digicert orders"
         method_option :filter, type: :hash, desc: "Specify filter options"
 
@@ -22,12 +26,49 @@ module Digicert
 
         desc "reissue ORDER_ID", "Reissue digicert order"
         option :csr, desc: "The CSR content from a file"
+        method_option :common_name, desc: "Certificate Common Name"
+        method_option :signature_hash, desc: "Certificate signature hash"
         option :output, aliases: "-o", desc: "Path to download certificates"
 
         def reissue(order_id)
           say(reissue_an_order(order_id))
         end
 
+        desc "create", "Create a new order"
+        method_option :csr, desc: "The CSR content from a file"
+        method_option :common_name, desc: "Certificate Common Name"
+        method_option :signature_hash, desc: "Certificate signature hash"
+        method_option :organization_id, desc: "The Organization ID"
+        method_option :validity_years, desc: "Validity years for certificate"
+        method_option :comments, desc: "Comments about the certificate order"
+        method_option :payment_method, desc: "Speicfy the payment method"
+
+        method_option :disable_renewal_notifications, type: :boolean
+        method_option :server_platform_id, desc: "Server Platform Id"
+        method_option :profile_option, desc: "Specify certificate profile"
+        method_option :organization_units, type: :array, desc: "organization_units"
+        method_option :custom_expiration_date, desc: "Expiry Date in YYY-MM-DD"
+        method_option :renewal_of_order_id, desc: "Id for renewalable Order"
+        method_option :disable_ct, type: :boolean, desc: "Disable CT logging"
+
+        def create(name_id)
+          order = create_new_order(name_id, options)
+          say("New Order Created! Oder Id: #{order.id}.")
+
+        rescue Digicert::Errors::RequestError => error
+          say("Request Error: #{error}.")
+        end
+
+        desc "duplicate ORDER_ID", "Duplicate digicert order"
+        option :csr, desc: "The CSR content from a file"
+        method_option :common_name, desc: "Certificate Common Name"
+        method_option :signature_hash, desc: "Certificate signature hash"
+        option :output, aliases: "-o", desc: "Path to download certificate"
+
+        def duplicate(order_id)
+          say(duplicate_an_order(order_id))
+        end
+
         private
 
         def order_instance
@@ -39,6 +80,16 @@ module Digicert
             options.merge(order_id: order_id),
           ).create
         end
+
+        def create_new_order(name_id, options)
+          Digicert::CLI::OrderCreator.create(name_id, options)
+        end
+
+        def duplicate_an_order(order_id)
+          Digicert::CLI::OrderDuplicator.new(
+            options.merge(order_id: order_id),
+          ).create
+        end
       end
     end
   end

data/lib/digicert/cli/csr.rb

@@ -8,24 +8,38 @@ module Digicert
       end
 
       def generate
-        if order
-          generate_csr_for(order)
+        if order || valid_data?
+          generate_new_csr
         end
       end
 
       private
 
-      attr_reader :rsa_key
+      attr_reader :rsa_key, :organization_id, :common_name
 
       def extract_local_attributes(options)
         @rsa_key = options.fetch(:key, nil)
+        @common_name = options.fetch(:common_name, nil)
+        @organization_id = options.fetch(:organization_id, nil)
+      end
+
+      def valid_data?
+        !organization.nil? && !options[:common_name].nil?
       end
 
       def order
-        @order ||= Digicert::Order.fetch(order_id)
+        if order_id
+          @order ||= Digicert::Order.fetch(order_id)
+        end
+      end
+
+      def organization
+        if organization_id
+          @organization ||= Digicert::Organization.fetch(organization_id)
+        end
       end
 
-      def generate_csr_for(order)
+      def generate_new_csr
         if rsa_key && File.exists?(rsa_key)
           Digicert::CSRGenerator.generate(csr_attributes(order))
         end
@@ -34,9 +48,8 @@ module Digicert
       def csr_attributes(order)
         Hash.new.tap do |csr|
           csr[:rsa_key] = File.read(rsa_key)
-          csr[:organization] = order.organization
-          csr[:common_name] =
-            options[:common_name] || order.certificate.common_name
+          csr[:organization] = organization || order.organization
+          csr[:common_name] = common_name || order.certificate.common_name
 
           if options[:san]
             csr[:san_names] = options[:san]

data/lib/digicert/cli/order_creator.rb

@@ -0,0 +1,58 @@
+module Digicert
+  module CLI
+    class OrderCreator < Digicert::CLI::Base
+      def initialize(name_id, attributes)
+        @name_id = name_id
+        @attributes = attributes
+      end
+
+      def create
+        create_order
+      end
+
+      def self.create(name_id, attributes)
+        new(name_id, attributes).create
+      end
+
+      private
+
+      attr_reader :name_id, :attributes
+
+      def create_order
+        Digicert::Order.create(name_id, order_attributes)
+      end
+
+      def csr_file_content(csr_file)
+        if csr_file && File.exists?(csr_file)
+          File.read(csr_file)
+        end
+      end
+
+      def organization
+        Digicert::Organization.all.last
+      end
+
+      def order_attributes
+        {
+          certificate: {
+            common_name: attributes[:common_name],
+            csr: csr_file_content(attributes[:csr]),
+            signature_hash: attributes[:signature_hash],
+            organization_units: attributes[:organization_units],
+            server_platform: { id: attributes[:server_platform_id] },
+            profile_option: attributes[:profile_option],
+          },
+
+          organization: { id: attributes[:organization_id] || organization.id },
+          validity_years: attributes[:validity_years] || 3,
+          custom_expiration_date: attributes[:custom_expiration_date],
+          comments: attributes[:comments],
+          disable_renewal_notifications: attributes[:disable_renewal_notifications],
+          renewal_of_order_id: attributes[:renewal_of_order_id],
+          payment_method: attributes[:payment_method],
+          disable_ct: attributes[:disable_ct],
+        }
+      end
+    end
+  end
+end

data/lib/digicert/cli/order_duplicator.rb

@@ -0,0 +1,62 @@
+module Digicert
+  module CLI
+    class OrderDuplicator < Digicert::CLI::Base
+      def create
+        apply_output_options(duplicate_an_order)
+      end
+
+      private
+
+      attr_reader :csr_file, :output_path
+
+      def extract_local_attributes(options)
+        @csr_file = options.fetch(:csr, nil)
+        @output_path = options.fetch(:output, "/tmp")
+      end
+
+      def duplicate_an_order
+        Digicert::OrderDuplicator.create(order_params)
+      end
+
+      def order_params
+        Hash.new.tap do |order_params|
+          order_params[:order_id] = order_id
+
+          if csr_file && File.exists?(csr_file)
+            order_params[:csr] = File.read(csr_file)
+          end
+        end
+      end
+
+      def apply_output_options(duplicate)
+        if duplicate
+          print_request_details(duplicate.requests.first)
+          fetch_and_download_certificate(duplicate.requests.first.id)
+        end
+      end
+
+      def print_request_details(request)
+        Digicert::CLI::Util.say(
+          "Duplication request #{request.id} created for order - #{order_id}",
+        )
+      end
+
+      def fetch_and_download_certificate(request_id)
+        if options[:output]
+          certificate = fetch_certificate(request_id)
+          download_certificate_order(certificate.id)
+        end
+      end
+
+      def fetch_certificate(request_id)
+        Digicert::DuplicateCertificateFinder.find_by(request_id: request_id)
+      end
+
+      def download_certificate_order(certificate_id)
+        Digicert::CLI::CertificateDownloader.download(
+          filename: order_id, path: output_path, certificate_id: certificate_id,
+        )
+      end
+    end
+  end
+end

data/lib/digicert/cli/order_reissuer.rb

@@ -1,8 +1,3 @@
-require "date"
-
-require "digicert/cli/order_retriever"
-require "digicert/cli/certificate_downloader"
-
 module Digicert
   module CLI
     class OrderReissuer < Digicert::CLI::Base

data/lib/digicert/cli/util.rb

@@ -1,3 +1,4 @@
+require "digicert"
 require "terminal-table"
 
 module Digicert
@@ -13,6 +14,19 @@ module Digicert
       def self.say(message, color = nil)
         Thor::Shell::Basic.new.say(message, color)
       end
+
+      def self.run(arguments)
+        if arguments.include?("--debug")
+          arguments.delete("--debug")
+
+          Digicert.configuration.debug_mode = true
+          Digicert::CLI::Command.start(arguments)
+          Digicert.configuration.debug_mode = true
+        else
+
+          Digicert::CLI::Command.start(arguments)
+        end
+      end
     end
   end
 end

data/lib/digicert/cli/version.rb

@@ -22,6 +22,6 @@
 
 module Digicert
   module CLI
-    VERSION = "0.4.2".freeze
+    VERSION = "0.5.0".freeze
   end
 end

data/spec/acceptance/certificate_spec.rb

@@ -6,7 +6,7 @@ RSpec.describe "Certificate" do
       command = %w(certificate fetch 123456 --quiet)
       allow(certificate_klass).to receive_message_chain(:new, :fetch)
 
-      Digicert::CLI.start(command)
+      _output = capture_stdout { Digicert::CLI.start(command) }
 
       expect(certificate_klass.new).to have_received(:fetch)
       expect(certificate_klass).to have_received(:new).with(
@@ -20,7 +20,7 @@ RSpec.describe "Certificate" do
       command = %w(certificate fetch 123456 --output /tmp/downloads)
       allow(Digicert::CLI::Certificate).to receive_message_chain(:new, :fetch)
 
-      Digicert::CLI.start(command)
+      _output = capture_stdout { Digicert::CLI.start(command) }
 
       expect(Digicert::CLI::Certificate).to have_received(:new).with(
         order_id: "123456", output: "/tmp/downloads"
@@ -36,7 +36,7 @@ RSpec.describe "Certificate" do
         Digicert::CLI::Certificate,
       ).to receive_message_chain(:new, :duplicates)
 
-      Digicert::CLI.start(command)
+      _output = capture_stdout { Digicert::CLI.start(command) }
 
       expect(
         Digicert::CLI::Certificate,
@@ -52,7 +52,7 @@ RSpec.describe "Certificate" do
         Digicert::CLI::Certificate,
       ).to receive_message_chain(:new, :download)
 
-      Digicert::CLI.start(command)
+      _output = capture_stdout { Digicert::CLI.start(command) }
 
       expect(
         Digicert::CLI::Certificate,

data/spec/acceptance/config_spec.rb

@@ -4,9 +4,9 @@ RSpec.describe "Config" do
   describe "configuring key" do
     it "stores the provided api key" do
       command = %w(config api-key DIGICERT_SECRET_KEY)
-      allow(Digicert::CLI::RCFile).to receive(:set_key)
 
-      Digicert::CLI.start(command)
+      allow(Digicert::CLI::RCFile).to receive(:set_key)
+      _output = capture_stdout { Digicert::CLI.start(command) }
 
       expect(
         Digicert::CLI::RCFile,

data/spec/acceptance/csr_spec.rb

@@ -6,7 +6,7 @@ RSpec.describe "CSR" do
       command = %w(csr fetch 123456)
       allow(Digicert::CLI::CSR).to receive_message_chain(:new, :fetch)
 
-      Digicert::CLI.start(command)
+      _output = capture_stdout { Digicert::CLI.start(command) }
 
       expect(Digicert::CLI::CSR).to have_received(:new).with(order_id: "123456")
     end
@@ -18,29 +18,29 @@ RSpec.describe "CSR" do
         allow(Digicert::CLI::CSR).to receive_message_chain(:new, :generate)
         command = %w(csr generate -o 123456 --key ./spec/fixtures/rsa4096.key)
 
-        Digicert::CLI.start(command)
+        _output = capture_stdout { Digicert::CLI.start(command) }
 
         expect(Digicert::CLI::CSR).to have_received(:new).with(
           order_id: "123456", key: "./spec/fixtures/rsa4096.key",
         )
-      end end
+      end
+    end
 
     context "with provided details" do
       it "generates a new CSR with the details" do
         command = %w(
           csr generate
-          --order-id 123456
+          --organization_id 1234
           --common_name ribosetest.com
           --key ./spec/fixtures/rsa4096.key
           --san site1.ribosetest.com site2.ribosetest.com
         )
 
         allow(Digicert::CLI::CSR).to receive_message_chain(:new, :generate)
-
-        Digicert::CLI.start(command)
+        _output = capture_stdout { Digicert::CLI.start(command) }
 
         expect(Digicert::CLI::CSR).to have_received(:new).with(
-          order_id: "123456",
+          organization_id: "1234",
           common_name: "ribosetest.com",
           key: "./spec/fixtures/rsa4096.key",
           san: ["site1.ribosetest.com", "site2.ribosetest.com"],

data/spec/acceptance/duplicating_order_spec.rb

@@ -0,0 +1,22 @@
+require "spec_helper"
+
+RSpec.describe "Order duplicating" do
+  describe "duplicate an order" do
+    context "duplicate with new csr" do
+      it "duplicate an order with provided csr" do
+        mock_digicert_order_duplication_message_chain
+        command = %w(order duplicate 123456 --csr ./spec/fixtures/rsa4096.csr)
+
+        _output = capture_stdout { Digicert::CLI.start(command) }
+
+        expect(Digicert::CLI::OrderDuplicator).to have_received(:new).
+          with(order_id: "123456", csr: "./spec/fixtures/rsa4096.csr")
+      end
+    end
+  end
+
+  def mock_digicert_order_duplication_message_chain
+    allow(Digicert::CLI::OrderDuplicator).
+      to receive_message_chain(:new, :create)
+  end
+end

data/spec/acceptance/order_spec.rb

@@ -4,9 +4,9 @@ RSpec.describe "Order" do
   describe "listing orders" do
     it "retrieves the list of the orders" do
       command = %w(order list --filter common_name:*.ribostetest.com)
-      allow(Digicert::CLI::Order).to receive_message_chain(:new, :list)
 
-      Digicert::CLI.start(command)
+      allow(Digicert::CLI::Order).to receive_message_chain(:new, :list)
+      _output = capture_stdout { Digicert::CLI.start(command) }
 
       expect(Digicert::CLI::Order.new).to have_received(:list)
     end
@@ -15,11 +15,45 @@ RSpec.describe "Order" do
   describe "finding an order" do
     it "finds a specific order based on the filters params" do
       command = %w(order find --filter common_name:ribosetest.com)
-      allow(Digicert::CLI::Order).to receive_message_chain(:new, :find)
 
-      Digicert::CLI.start(command)
+      allow(Digicert::CLI::Order).to receive_message_chain(:new, :find)
+      _output = capture_stdout { Digicert::CLI.start(command) }
 
       expect(Digicert::CLI::Order.new).to have_received(:find)
     end
   end
+
+  describe "creating an order" do
+    context "with valid information" do
+      it "creates a new certificate order" do
+        allow(
+          Digicert::CLI::OrderCreator,
+        ).to receive(:create).and_return(double("order", id: 123_456))
+
+        command = %w(
+          order create ssl_plus
+            --csr ./spec/fixtures/rsa4096.csr
+            --common-name ribosetest.com
+            --signature-hash sha512
+            --organization-id 123456
+            --validity-years 3
+            --payment-method card
+        )
+
+        output = capture_stdout { Digicert::CLI.start(command) }
+
+        expect(output).to include("New Order Created! Oder Id")
+        expect(Digicert::CLI::OrderCreator).to have_received(:create).
+          with(
+            "ssl_plus",
+            "csr" => "./spec/fixtures/rsa4096.csr",
+            "common_name" => "ribosetest.com",
+            "signature_hash" => "sha512",
+            "organization_id" => "123456",
+            "validity_years" => "3",
+            "payment_method" => "card",
+          )
+      end
+    end
+  end
 end

data/spec/acceptance/reissuing_order_spec.rb

@@ -7,7 +7,7 @@ RSpec.describe "Order reissuing" do
         mock_digicert_order_reissuer_create_message_chain
         command = %w(order reissue 123456 --csr ./spec/fixtures/rsa4096.csr)
 
-        Digicert::CLI.start(command)
+        _output = capture_stdout { Digicert::CLI.start(command) }
 
         expect(Digicert::CLI::OrderReissuer).to have_received(:new).
           with(order_id: "123456", csr: "./spec/fixtures/rsa4096.csr")
@@ -19,7 +19,7 @@ RSpec.describe "Order reissuing" do
         mock_digicert_order_reissuer_create_message_chain
         command = %w(order reissue 123456 --output /tmp/downloads)
 
-        Digicert::CLI.start(command)
+        _output = capture_stdout { Digicert::CLI.start(command) }
 
         expect(Digicert::CLI::OrderReissuer).to have_received(:new).
           with(order_id: "123456", output: "/tmp/downloads")

data/spec/digicert/cli/csr_spec.rb

@@ -29,14 +29,17 @@ RSpec.describe Digicert::CLI::CSR do
 
     context "with custom details" do
       it "generates a new csr using the provided details" do
-        order_id = 123456
+        organization_id = 123456
         common_name = "ribosetest.com"
         key_file = "./spec/fixtures/rsa4096.key"
         san = ["site1.ribosetest.com", "site2.ribosetest.com"]
-        stub_digicert_order_fetch_api(order_id)
+        stub_digicert_organization_fetch_api(organization_id)
 
         csr = Digicert::CLI::CSR.new(
-          order_id: order_id, common_name: common_name, san: san, key: key_file,
+          san: san,
+          key: key_file,
+          common_name: common_name,
+          organization_id: organization_id,
         ).generate
 
         expect(csr.start_with?("-----BEGIN CERTIFICATE REQUEST")).to be_truthy

data/spec/digicert/cli/order_creator_spec.rb

@@ -0,0 +1,60 @@
+require "spec_helper"
+
+RSpec.describe Digicert::CLI::OrderCreator do
+  describe ".create" do
+    context "with valid order information" do
+      it "creates a new digicert certificate order" do
+        name_id = "ssl_plus"
+        stub_digicert_order_create_api(
+          name_id, rest_order_attributes(order_attributes)
+        )
+
+        order = Digicert::CLI::OrderCreator.create(name_id, order_attributes)
+
+        expect(order.id).not_to be_nil
+        expect(order.requests.first.status).to eq("pending")
+      end
+    end
+  end
+
+  def order_attributes
+    @order_attributes ||= {
+      common_name: "ribosetest.com",
+      csr: "./spec/fixtures/rsa4096.csr",
+      signature_hash: "sha512",
+      organization_units: "Developer Units",
+      server_platform_id: "platform_id_101",
+      profile_option: "certificate-profile",
+      organization_id: "organization-id",
+      validity_years: 3,
+      custom_expiration_date: "11-11-2019",
+      comments: "Ordered using digicert CLI",
+      disable_renewal_notifications: false,
+      renewal_of_order_id: 123456,
+      payment_method: "balanace",
+      disable_ct: false,
+    }
+  end
+
+  def rest_order_attributes(attributes)
+    {
+      certificate: {
+        organization_units: attributes[:organization_units],
+        server_platform: { id: attributes[:server_platform_id] },
+        profile_option: attributes[:profile_option],
+        csr: File.read(attributes[:csr]),
+        common_name: attributes[:common_name],
+        signature_hash: attributes[:signature_hash],
+      },
+
+      organization: { id: attributes[:organization_id] },
+      validity_years: attributes[:validity_years],
+      custom_expiration_date: attributes[:custom_expiration_date],
+      comments: attributes[:comments],
+      disable_renewal_notifications: attributes[:disable_renewal_notifications],
+      renewal_of_order_id: attributes[:renewal_of_order_id],
+      payment_method: attributes[:payment_method],
+      disable_ct: attributes[:disable_ct],
+    }
+  end
+end

data/spec/digicert/cli/order_duplicator_spec.rb

@@ -0,0 +1,75 @@
+require "spec_helper"
+
+RSpec.describe Digicert::CLI::OrderDuplicator do
+  describe "#create" do
+    context "with a valid order id" do
+      it "sends create message to digicert order duplicator" do
+        order_id = 123_456
+        allow(Digicert::OrderDuplicator).to receive(:create)
+
+        Digicert::CLI::OrderDuplicator.new(order_id: order_id).create
+
+        expect(
+          Digicert::OrderDuplicator,
+        ).to have_received(:create).with(order_id: order_id)
+      end
+    end
+
+    context "with order id and new csr" do
+      it "sends create message to duplicator with new csr" do
+        order_id = 123_456
+        csr_file = "./spec/fixtures/rsa4096.csr"
+        allow(Digicert::OrderDuplicator).to receive(:create)
+
+        Digicert::CLI::OrderDuplicator.new(
+          order_id: order_id, csr: csr_file,
+        ).create
+
+        expect(Digicert::OrderDuplicator).to have_received(:create).with(
+          order_id: order_id, csr: File.read(csr_file),
+        )
+      end
+    end
+
+    context "with order id and --fetch option" do
+      it "duplicates order and fetch the updated order" do
+        order_id = 456_789
+
+        mock_order_fetch_and_download_requests(order)
+        stub_digicert_order_duplicate_api(order_id, order_attributes(order))
+        allow(Digicert::CLI::CertificateDownloader).to receive(:download)
+
+        Digicert::CLI::OrderDuplicator.new(
+          order_id: order_id, output: "/tmp", number_of_times: 1, wait_time: 1,
+        ).create
+
+        expect(Digicert::CLI::CertificateDownloader).
+          to have_received(:download).
+          with(hash_including(certificate_id: order.certificate.id))
+      end
+    end
+
+    def order(order_id = 123_456)
+      stub_digicert_order_fetch_api(order_id)
+      @order ||= Digicert::Order.fetch(order_id)
+    end
+
+    def order_attributes(order)
+      {
+        common_name: order.certificate.common_name,
+        dns_names: order.certificate.dns_names,
+        csr: order.certificate.csr,
+        signature_hash: order.certificate.signature_hash,
+        server_platform: { id: 45 },
+      }
+    end
+
+    def mock_order_fetch_and_download_requests(order)
+      allow(Digicert::Order).to receive(:fetch).and_return(order)
+
+      allow(
+        Digicert::DuplicateCertificateFinder,
+      ).to receive(:find_by).and_return(order.certificate)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -7,6 +7,7 @@ Dir["./spec/support/**/*.rb"].sort.each { |file| require file }
 RSpec.configure do |config|
   # Enable flags like --only-failures and --next-failure
   config.example_status_persistence_file_path = ".rspec_status"
+  config.include Digicert::ConsoleHelper
 
   config.expect_with :rspec do |c|
     c.syntax = :expect

data/spec/support/console_helper.rb

@@ -0,0 +1,29 @@
+module Digicert
+  module ConsoleHelper
+    def capture_stdout(&_block)
+      original_stdout = $stdout
+      $stdout = fake = StringIO.new
+
+      begin
+        yield
+      ensure
+        $stdout = original_stdout
+      end
+
+      fake.string
+    end
+
+    def capture_stderr(&_block)
+      original_stderr = $stderr
+      $stderr = fake = StringIO.new
+
+      begin
+        yield
+      ensure
+        $stderr = original_stderr
+      end
+
+      fake.string
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: digicert-cli
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-23 00:00:00.000000000 Z
+date: 2019-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: openssl
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.11.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.11.3
 description: The CLI for digicert API
 email:
 - operations@ribose.com
@@ -156,6 +170,8 @@ files:
 - lib/digicert/cli/csr.rb
 - lib/digicert/cli/filter_builder.rb
 - lib/digicert/cli/order.rb
+- lib/digicert/cli/order_creator.rb
+- lib/digicert/cli/order_duplicator.rb
 - lib/digicert/cli/order_reissuer.rb
 - lib/digicert/cli/order_retriever.rb
 - lib/digicert/cli/rcfile.rb
@@ -164,12 +180,15 @@ files:
 - spec/acceptance/certificate_spec.rb
 - spec/acceptance/config_spec.rb
 - spec/acceptance/csr_spec.rb
+- spec/acceptance/duplicating_order_spec.rb
 - spec/acceptance/order_spec.rb
 - spec/acceptance/reissuing_order_spec.rb
 - spec/digicert/cli/certificate_downloader_spec.rb
 - spec/digicert/cli/certificate_spec.rb
 - spec/digicert/cli/csr_spec.rb
 - spec/digicert/cli/filter_builder_spec.rb
+- spec/digicert/cli/order_creator_spec.rb
+- spec/digicert/cli/order_duplicator_spec.rb
 - spec/digicert/cli/order_reissuer_spec.rb
 - spec/digicert/cli/order_retriever_spec.rb
 - spec/digicert/cli/order_spec.rb
@@ -179,6 +198,7 @@ files:
 - spec/fixtures/rsa4096.csr
 - spec/fixtures/rsa4096.key
 - spec/spec_helper.rb
+- spec/support/console_helper.rb
 - spec/support/disable-logging.rb
 homepage: https://www.ribose.com
 licenses: []