Skip to content
This repository has been archived by the owner on Nov 30, 2017. It is now read-only.

Commit

Permalink
Merge pull request #12 from blackducksoftware/ek_add_flat_bdio
Browse files Browse the repository at this point in the history 
adding outputDirectory back to config
  • Loading branch information
@ekerwin
ekerwin committed Sep 9, 2016
2 parents 5b771fb + 63a01b9 commit 8e9f624
Show file tree
Hide file tree
Showing 7 changed files with 74 additions and 147 deletions.
8 changes: 4 additions & 4 deletions src/main/java/com/blackducksoftware/integration/gradle/DependencyGatherer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,15 @@ public class DependencyGatherer {
public final static String PROPERTY_HUB_PROJECT_VERSION = "hubProjectVersion";
private final Logger logger = LoggerFactory.getLogger(DependencyGatherer.class);

private final BdioHelper bdioHelper;
private final TaskHelper taskHelper;
private final Project rootProject;
final Map<String, DependencyNode> visitedMap = new HashMap<>();
private final String hubProjectName;
private final String hubProjectVersion;

public DependencyGatherer(final BdioHelper bdioHelper, final Project project, final String hubProjectName,
public DependencyGatherer(final TaskHelper taskHelper, final Project project, final String hubProjectName,
final String hubProjectVersion) {
this.bdioHelper = bdioHelper;
this.taskHelper = taskHelper;
this.rootProject = project;
this.hubProjectName = hubProjectName;
this.hubProjectVersion = hubProjectVersion;
Expand Down Expand Up @@ -94,7 +94,7 @@ public void handleBdioOutput() throws IOException {
getProjectDependencies(childProject, children);
}
logger.info("creating bdio file");
final File file = bdioHelper.getBdioFile(rootProject);
final File file = taskHelper.getBdioFile(rootProject);
try (final OutputStream outputStream = new FileOutputStream(file)) {
final BdioConverter bdioConverter = new BdioConverter();
final CommonBomFormatter commonBomFormatter = new CommonBomFormatter(bdioConverter);
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/blackducksoftware/integration/gradle/HubBdioDeployer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
public class HubBdioDeployer {
private final Logger logger = LoggerFactory.getLogger(HubBdioDeployer.class);

private final BdioHelper bdioHelper;
private final TaskHelper taskHelper;
private final Project project;
private final String hubUrl;
private final String hubUsername;
Expand All @@ -63,11 +63,11 @@ public class HubBdioDeployer {
private final String hubProxyUsername;
private final String hubProxyPassword;

public HubBdioDeployer(final BdioHelper bdioHelper, final Project project, final String hubUrl,
public HubBdioDeployer(final TaskHelper taskHelper, final Project project, final String hubUrl,
final String hubUsername, final String hubPassword, final String hubTimeout, final String hubProxyHost,
final String hubProxyPort, final String hubNoProxyHosts, final String hubProxyUsername,
final String hubProxyPassword) {
this.bdioHelper = bdioHelper;
this.taskHelper = taskHelper;
this.project = project;
this.hubUrl = hubUrl;
this.hubUsername = hubUsername;
Expand All @@ -82,7 +82,7 @@ public HubBdioDeployer(final BdioHelper bdioHelper, final Project project, final

public void deployToHub() {
logger.info("Deploying Black Duck I/O output");
final File file = bdioHelper.getBdioFile(project);
final File file = taskHelper.getBdioFile(project);

final HubServerConfigBuilder builder = new HubServerConfigBuilder();
builder.setHubUrl(hubUrl);
Expand Down
27 changes: 20 additions & 7 deletions src/main/java/com/blackducksoftware/integration/gradle/HubGradlePlugin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import com.blackducksoftware.integration.gradle.task.CreateFlatDependencyList;
import com.blackducksoftware.integration.gradle.task.CreateHubOutput;
import com.blackducksoftware.integration.gradle.task.DeployHubOutput;

Expand All @@ -38,37 +39,49 @@ public void apply(final Project project) {
return;
}

final BdioHelper bdioHelper = new BdioHelper(project);
final TaskHelper taskHelper = new TaskHelper(project);

if (null == project.getTasks().findByName("createHubOutput")) {
createCreateHubOutputTask(project, bdioHelper);
createCreateHubOutputTask(project, taskHelper);
}

if (null == project.getTasks().findByName("deployHubOutput")) {
createDeployHubOutputTask(project, bdioHelper);
createDeployHubOutputTask(project, taskHelper);
}
}

private void createCreateHubOutputTask(final Project project, final BdioHelper bdioHelper) {
private void createCreateHubOutputTask(final Project project, final TaskHelper taskHelper) {
logger.info(String.format("Configuring createHubOutput task for project path: %s", project.getPath()));

final CreateHubOutput createHubOutputTask = project.getTasks().create("createHubOutput", CreateHubOutput.class);
createHubOutputTask.setDescription("Generate the bdio file.");
createHubOutputTask.setGroup("reporting");
createHubOutputTask.setBdioHelper(bdioHelper);
createHubOutputTask.taskHelper = taskHelper;

logger.info("Successfully configured createHubOutput");
}

private void createDeployHubOutputTask(final Project project, final BdioHelper bdioHelper) {
private void createDeployHubOutputTask(final Project project, final TaskHelper taskHelper) {
logger.info(String.format("Configuring deployHubOutput task for project path: %s", project.getPath()));

final DeployHubOutput deployHubOutputTask = project.getTasks().create("deployHubOutput", DeployHubOutput.class);
deployHubOutputTask.setDescription("Deploy the bdio file to the specified Hub server.");
deployHubOutputTask.setGroup("reporting");
deployHubOutputTask.setBdioHelper(bdioHelper);
deployHubOutputTask.taskHelper = taskHelper;

logger.info("Successfully configured deployHubOutput");
}

private void createFlatDependencyListTask(final Project project, final TaskHelper taskHelper) {
logger.info(String.format("Configuring createHubOutput task for project path: %s", project.getPath()));

final CreateFlatDependencyList createFlatDependencyListTask = project.getTasks()
.create("createFlatDependencyList", CreateFlatDependencyList.class);
createFlatDependencyListTask.setDescription("Generate a flat list of unique dependencies.");
createFlatDependencyListTask.setGroup("reporting");
createFlatDependencyListTask.taskHelper = taskHelper;

logger.info("Successfully configured createHubOutput");
}

}
24 changes: 15 additions & 9 deletions ...ftware/integration/gradle/BdioHelper.java → ...ftware/integration/gradle/TaskHelper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,34 @@

import java.io.File;

import org.apache.commons.lang3.StringUtils;
import org.gradle.api.Project;

import com.blackducksoftware.integration.build.bdio.Constants;

public class BdioHelper {
public class TaskHelper {
private final Project project;
private File blackDuckReports;

public BdioHelper(final Project project) {
public TaskHelper(final Project project) {
this.project = project;
}

public boolean ensureReportsDirectoryExists() {
File reportsDirectory;
if (project.getRootProject() != null) {
final Project rootProject = project.getRootProject();
reportsDirectory = new File(rootProject.getBuildDir(), "reports");
public boolean ensureReportsDirectoryExists(final String userSpecifiedDirectory) {
if (StringUtils.isNotBlank(userSpecifiedDirectory)) {
blackDuckReports = new File(userSpecifiedDirectory);
} else {
reportsDirectory = new File(project.getBuildDir(), "reports");
File reportsDirectory;
if (project.getRootProject() != null) {
final Project rootProject = project.getRootProject();
reportsDirectory = new File(rootProject.getBuildDir(), "reports");
} else {
reportsDirectory = new File(project.getBuildDir(), "reports");
}

blackDuckReports = new File(reportsDirectory, "blackduck");
}

final File blackDuckReports = new File(reportsDirectory, "blackduck");
return blackDuckReports.mkdirs();
}

Expand Down
10 changes: 10 additions & 0 deletions src/main/java/com/blackducksoftware/integration/gradle/task/CreateFlatDependencyList.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package com.blackducksoftware.integration.gradle.task;

import org.gradle.api.DefaultTask;

import com.blackducksoftware.integration.gradle.TaskHelper;

public class CreateFlatDependencyList extends DefaultTask {
public TaskHelper taskHelper;

}
37 changes: 7 additions & 30 deletions src/main/java/com/blackducksoftware/integration/gradle/task/CreateHubOutput.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,46 +27,23 @@
import org.gradle.api.Project;
import org.gradle.api.tasks.TaskAction;

import com.blackducksoftware.integration.gradle.BdioHelper;
import com.blackducksoftware.integration.gradle.DependencyGatherer;
import com.blackducksoftware.integration.gradle.TaskHelper;

public class CreateHubOutput extends DefaultTask {
private BdioHelper bdioHelper;
private String hubProjectName;
private String hubProjectVersion;
public TaskHelper taskHelper;
public String hubProjectName;
public String hubProjectVersion;
public String outputDirectory;

@TaskAction
public void gatherDependencies() throws IOException {
bdioHelper.ensureReportsDirectoryExists();
taskHelper.ensureReportsDirectoryExists(outputDirectory);
final Project project = getProject();

final DependencyGatherer dependencyGatherer = new DependencyGatherer(bdioHelper, project, hubProjectName,
final DependencyGatherer dependencyGatherer = new DependencyGatherer(taskHelper, project, hubProjectName,
hubProjectVersion);
dependencyGatherer.handleBdioOutput();
}

public BdioHelper getBdioHelper() {
return bdioHelper;
}

public void setBdioHelper(final BdioHelper bdioHelper) {
this.bdioHelper = bdioHelper;
}

public String getHubProjectName() {
return hubProjectName;
}

public void setHubProjectName(final String hubProjectName) {
this.hubProjectName = hubProjectName;
}

public String getHubProjectVersion() {
return hubProjectVersion;
}

public void setHubProjectVersion(final String hubProjectVersion) {
this.hubProjectVersion = hubProjectVersion;
}

}
107 changes: 14 additions & 93 deletions src/main/java/com/blackducksoftware/integration/gradle/task/DeployHubOutput.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,110 +27,31 @@
import org.gradle.api.Project;
import org.gradle.api.tasks.TaskAction;

import com.blackducksoftware.integration.gradle.BdioHelper;
import com.blackducksoftware.integration.gradle.HubBdioDeployer;
import com.blackducksoftware.integration.gradle.TaskHelper;

public class DeployHubOutput extends DefaultTask {
private BdioHelper bdioHelper;
private String hubUrl;
private String hubUsername;
private String hubPassword;
private String hubTimeout;
private String hubProxyHost;
private String hubProxyPort;
private String hubNoProxyHosts;
private String hubProxyUsername;
private String hubProxyPassword;
public TaskHelper taskHelper;
public String hubUrl;
public String hubUsername;
public String hubPassword;
public String hubTimeout;
public String hubProxyHost;
public String hubProxyPort;
public String hubNoProxyHosts;
public String hubProxyUsername;
public String hubProxyPassword;
public String outputDirectory;

@TaskAction
public void deployBdioFileToHub() throws IOException {
bdioHelper.ensureReportsDirectoryExists();
taskHelper.ensureReportsDirectoryExists(outputDirectory);
final Project project = getProject();

final HubBdioDeployer hubBdioDeployer = new HubBdioDeployer(bdioHelper, project, hubUrl, hubUsername,
final HubBdioDeployer hubBdioDeployer = new HubBdioDeployer(taskHelper, project, hubUrl, hubUsername,
hubPassword, hubTimeout, hubProxyHost, hubProxyPort, hubNoProxyHosts, hubProxyUsername,
hubProxyPassword);
hubBdioDeployer.deployToHub();
}

public BdioHelper getBdioHelper() {
return bdioHelper;
}

public void setBdioHelper(final BdioHelper bdioHelper) {
this.bdioHelper = bdioHelper;
}

public String getHubUrl() {
return hubUrl;
}

public void setHubUrl(final String hubUrl) {
this.hubUrl = hubUrl;
}

public String getHubUsername() {
return hubUsername;
}

public void setHubUsername(final String hubUsername) {
this.hubUsername = hubUsername;
}

public String getHubPassword() {
return hubPassword;
}

public void setHubPassword(final String hubPassword) {
this.hubPassword = hubPassword;
}

public String getHubTimeout() {
return hubTimeout;
}

public void setHubTimeout(final String hubTimeout) {
this.hubTimeout = hubTimeout;
}

public String getHubProxyHost() {
return hubProxyHost;
}

public void setHubProxyHost(final String hubProxyHost) {
this.hubProxyHost = hubProxyHost;
}

public String getHubProxyPort() {
return hubProxyPort;
}

public void setHubProxyPort(final String hubProxyPort) {
this.hubProxyPort = hubProxyPort;
}

public String getHubNoProxyHosts() {
return hubNoProxyHosts;
}

public void setHubNoProxyHosts(final String hubNoProxyHosts) {
this.hubNoProxyHosts = hubNoProxyHosts;
}

public String getHubProxyUsername() {
return hubProxyUsername;
}

public void setHubProxyUsername(final String hubProxyUsername) {
this.hubProxyUsername = hubProxyUsername;
}

public String getHubProxyPassword() {
return hubProxyPassword;
}

public void setHubProxyPassword(final String hubProxyPassword) {
this.hubProxyPassword = hubProxyPassword;
}

}

0 comments on commit 8e9f624

Please sign in to comment.