rename

5 years ago · a0cb449bf2
38 changed files with 254 additions and 247 deletions
--- a/6
+++ b/6
@ -1,4 +1,4 @@
-Package: crsspy
+Package: cspy
 Type: Package
 Title: Content Security Policy Decomposer & Evaluator
 Version: 2.6.0
@ -12,8 +12,8 @@ Description: Methods are provided to decompose, display, and validate
    content security policy header values. Wraps the 'Shape Security'
    'salvation' Java library (<https://github.com/shapesecurity/salvation>).
    Package version tracks 'salvation' Java archive version.
-URL: https://gitlab.com/hrbrmstr/crsspy
-BugReports: https://gitlab.com/hrbrmstr/crsspy/issues
+URL: https://gitlab.com/hrbrmstr/cspy
+BugReports: https://gitlab.com/hrbrmstr/cspy/issues
 Encoding: UTF-8
 License: Apache License (>= 2.0)
 Suggests:
--- a/README.Rmd
+++ b/README.Rmd
@ -12,7 +12,7 @@ options(width=120)
 [![Coverage Status](https://codecov.io/gh/hrbrmstr/crsspy/branch/master/graph/badge.svg)](https://codecov.io/gh/hrbrmstr/crsspy)
 [![CRAN_Status_Badge](http://www.r-pkg.org/badges/version/crsspy)](https://cran.r-project.org/package=crsspy)

-# crsspy
+# cspy

 Content Security Policy Decomposer & Evaluator

@ -25,16 +25,16 @@ The following functions are implemented:
 ## Installation

 ```{r install-ex, eval=FALSE}
-install.packages("crsspy", repos = "https://cinc.rud.is/")
+install.packages("cspy", repos = "https://cinc.rud.is/")
 ```

 ## Usage

 ```{r lib-ex}
-library(crsspy)
+library(cspy)

 # current version
-packageVersion("crsspy")
+packageVersion("cspy")

 ```

--- a/crsspy.Rproj
+++ b/crsspy.Rproj
--- a/java/crsspy/Makefile
+++ b/java/crsspy/Makefile
@ -1,15 +0,0 @@
-.PHONY: clean pkg deps
-
-pkg:
-	mvn --quiet package
-	cp target/crsspy-1.0-SNAPSHOT.jar ../../inst/java
-	cp deps/salvation-2.6.0.jar ../../inst/java
-
-deps:
-	mvn dependency:copy-dependencies -DoutputDirectory=deps
-
-clean:
-	mvn clean
-
-new:
-	mvn archetype:generate -DgroupId=is.rud.crsspy -DartifactId=crsspy -DarchetypeArtifactId=maven-archetype-quickstart -DarchetypeVersion=1.4 -DinteractiveMode=false
--- a/java/crsspy/target/classes/is/rud/crsspy/App.class
+++ b/java/crsspy/target/classes/is/rud/crsspy/App.class
--- a/java/crsspy/target/crsspy-1.0-SNAPSHOT.jar
+++ b/java/crsspy/target/crsspy-1.0-SNAPSHOT.jar
--- a/java/crsspy/target/maven-archiver/pom.properties
+++ b/java/crsspy/target/maven-archiver/pom.properties
@ -1,4 +0,0 @@
-#Created by Apache Maven 3.6.0
-version=1.0-SNAPSHOT
-groupId=is.rud.crsspy
-artifactId=crsspy
--- a/java/crsspy/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+++ b/java/crsspy/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@ -1 +0,0 @@
-is/rud/crsspy/App.class
--- a/java/crsspy/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+++ b/java/crsspy/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@ -1 +0,0 @@
-/Users/bob/packages/crsspy/java/crsspy/src/main/java/is/rud/crsspy/App.java
--- a/java/crsspy/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
+++ b/java/crsspy/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
@ -1 +0,0 @@
-is/rud/crsspy/AppTest.class
--- a/java/crsspy/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
+++ b/java/crsspy/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
@ -1 +0,0 @@
-/Users/bob/packages/crsspy/java/crsspy/src/test/java/is/rud/crsspy/AppTest.java
--- a/java/crsspy/target/surefire-reports/TEST-is.rud.crsspy.AppTest.xml
+++ b/java/crsspy/target/surefire-reports/TEST-is.rud.crsspy.AppTest.xml
@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<testsuite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report.xsd" name="is.rud.crsspy.AppTest" time="0.041" tests="1" errors="0" skipped="0" failures="0">
-  <properties>
-    <property name="gopherProxySet" value="false"/>
-    <property name="awt.toolkit" value="sun.lwawt.macosx.LWCToolkit"/>
-    <property name="file.encoding.pkg" value="sun.io"/>
-    <property name="java.specification.version" value="1.8"/>
-    <property name="sun.cpu.isalist" value=""/>
-    <property name="sun.jnu.encoding" value="UTF-8"/>
-    <property name="java.class.path" value="/Users/bob/packages/crsspy/java/crsspy/target/test-classes:/Users/bob/packages/crsspy/java/crsspy/target/classes:/Users/bob/.m2/repository/com/shapesecurity/salvation/2.6.0/salvation-2.6.0.jar:/Users/bob/.m2/repository/junit/junit/4.11/junit-4.11.jar:/Users/bob/.m2/repository/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar:"/>
-    <property name="java.vm.vendor" value="Oracle Corporation"/>
-    <property name="sun.arch.data.model" value="64"/>
-    <property name="java.vendor.url" value="http://java.oracle.com/"/>
-    <property name="user.timezone" value=""/>
-    <property name="java.vm.specification.version" value="1.8"/>
-    <property name="os.name" value="Mac OS X"/>
-    <property name="user.country" value="US"/>
-    <property name="sun.java.launcher" value="SUN_STANDARD"/>
-    <property name="sun.boot.library.path" value="/Library/Java/JavaVirtualMachines/jdk1.8.0_121.jdk/Contents/Home/jre/lib"/>
-    <property name="sun.java.command" value="/Users/bob/packages/crsspy/java/crsspy/target/surefire/surefirebooter7343046365811145022.jar /Users/bob/packages/crsspy/java/crsspy/target/surefire 2019-03-07T00-01-02_345-jvmRun1 surefire6617797701880136399tmp surefire_0437687093035167889tmp"/>
-    <property name="http.nonProxyHosts" value="local|*.local|169.254/16|*.169.254/16"/>
-    <property name="surefire.test.class.path" value="/Users/bob/packages/crsspy/java/crsspy/target/test-classes:/Users/bob/packages/crsspy/java/crsspy/target/classes:/Users/bob/.m2/repository/com/shapesecurity/salvation/2.6.0/salvation-2.6.0.jar:/Users/bob/.m2/repository/junit/junit/4.11/junit-4.11.jar:/Users/bob/.m2/repository/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar:"/>
-    <property name="sun.cpu.endian" value="little"/>
-    <property name="user.home" value="/Users/bob"/>
-    <property name="user.language" value="en"/>
-    <property name="java.specification.vendor" value="Oracle Corporation"/>
-    <property name="java.home" value="/Library/Java/JavaVirtualMachines/jdk1.8.0_121.jdk/Contents/Home/jre"/>
-    <property name="basedir" value="/Users/bob/packages/crsspy/java/crsspy"/>
-    <property name="file.separator" value="/"/>
-    <property name="line.separator" value="&#10;"/>
-    <property name="java.vm.specification.vendor" value="Oracle Corporation"/>
-    <property name="java.specification.name" value="Java Platform API Specification"/>
-    <property name="java.awt.graphicsenv" value="sun.awt.CGraphicsEnvironment"/>
-    <property name="surefire.real.class.path" value="/Users/bob/packages/crsspy/java/crsspy/target/surefire/surefirebooter7343046365811145022.jar"/>
-    <property name="sun.boot.class.path" value="/Library/Java/JavaVirtualMachines/jdk1.8.0_121.jdk/Contents/Home/jre/lib/resources.jar:/Library/Java/JavaVirtualMachines/jdk1.8.0_121.jdk/Contents/Home/jre/lib/rt.jar:/Library/Java/JavaVirtualMachines/jdk1.8.0_121.jdk/Contents/Home/jre/lib/sunrsasign.jar:/Library/Java/JavaVirtualMachines/jdk1.8.0_121.jdk/Contents/Home/jre/lib/jsse.jar:/Library/Java/JavaVirtualMachines/jdk1.8.0_121.jdk/Contents/Home/jre/lib/jce.jar:/Library/Java/JavaVirtualMachines/jdk1.8.0_121.jdk/Contents/Home/jre/lib/charsets.jar:/Library/Java/JavaVirtualMachines/jdk1.8.0_121.jdk/Contents/Home/jre/lib/jfr.jar:/Library/Java/JavaVirtualMachines/jdk1.8.0_121.jdk/Contents/Home/jre/classes"/>
-    <property name="sun.management.compiler" value="HotSpot 64-Bit Tiered Compilers"/>
-    <property name="ftp.nonProxyHosts" value="local|*.local|169.254/16|*.169.254/16"/>
-    <property name="java.runtime.version" value="1.8.0_121-b13"/>
-    <property name="user.name" value="bob"/>
-    <property name="path.separator" value=":"/>
-    <property name="os.version" value="10.14.4"/>
-    <property name="java.endorsed.dirs" value="/Library/Java/JavaVirtualMachines/jdk1.8.0_121.jdk/Contents/Home/jre/lib/endorsed"/>
-    <property name="java.runtime.name" value="Java(TM) SE Runtime Environment"/>
-    <property name="file.encoding" value="UTF-8"/>
-    <property name="java.vm.name" value="Java HotSpot(TM) 64-Bit Server VM"/>
-    <property name="localRepository" value="/Users/bob/.m2/repository"/>
-    <property name="java.vendor.url.bug" value="http://bugreport.sun.com/bugreport/"/>
-    <property name="java.io.tmpdir" value="/var/folders/9g/ptzggj090rv89mwc7nrhhfhh0000gn/T/"/>
-    <property name="java.version" value="1.8.0_121"/>
-    <property name="user.dir" value="/Users/bob/packages/crsspy/java/crsspy"/>
-    <property name="os.arch" value="x86_64"/>
-    <property name="java.vm.specification.name" value="Java Virtual Machine Specification"/>
-    <property name="java.awt.printerjob" value="sun.lwawt.macosx.CPrinterJob"/>
-    <property name="sun.os.patch.level" value="unknown"/>
-    <property name="java.library.path" value="/Users/bob/Library/Java/Extensions:/Library/Java/Extensions:/Network/Library/Java/Extensions:/System/Library/Java/Extensions:/usr/lib/java:."/>
-    <property name="java.vm.info" value="mixed mode"/>
-    <property name="java.vendor" value="Oracle Corporation"/>
-    <property name="java.vm.version" value="25.121-b13"/>
-    <property name="java.ext.dirs" value="/Users/bob/Library/Java/Extensions:/Library/Java/JavaVirtualMachines/jdk1.8.0_121.jdk/Contents/Home/jre/lib/ext:/Library/Java/Extensions:/Network/Library/Java/Extensions:/System/Library/Java/Extensions:/usr/lib/java"/>
-    <property name="sun.io.unicode.encoding" value="UnicodeBig"/>
-    <property name="java.class.version" value="52.0"/>
-    <property name="socksNonProxyHosts" value="local|*.local|169.254/16|*.169.254/16"/>
-  </properties>
-  <testcase name="shouldAnswerWithTrue" classname="is.rud.crsspy.AppTest" time="0.002"/>
-</testsuite>
--- a/java/crsspy/target/surefire-reports/is.rud.crsspy.AppTest.txt
+++ b/java/crsspy/target/surefire-reports/is.rud.crsspy.AppTest.txt
@ -1,4 +0,0 @@
-------------------------------------------------------------------------------
-Test set: is.rud.crsspy.AppTest
-------------------------------------------------------------------------------
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.041 s - in is.rud.crsspy.AppTest
--- a/java/crsspy/target/test-classes/is/rud/crsspy/AppTest.class
+++ b/java/crsspy/target/test-classes/is/rud/crsspy/AppTest.class
--- a/java/cspy/.classpath
+++ b/java/cspy/.classpath
@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" path="target/generated-sources/annotations">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="ignore_optional_problems" value="true"/>
+			<attribute name="m2e-apt" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="ignore_optional_problems" value="true"/>
+			<attribute name="m2e-apt" value="true"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
--- a/java/cspy/.project
+++ b/java/cspy/.project
@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>cspy</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>
--- a/java/cspy/.settings/org.eclipse.core.resources.prefs
+++ b/java/cspy/.settings/org.eclipse.core.resources.prefs
@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding//src/test/java=UTF-8
+encoding/<project>=UTF-8
--- a/java/cspy/.settings/org.eclipse.jdt.apt.core.prefs
+++ b/java/cspy/.settings/org.eclipse.jdt.apt.core.prefs
@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.apt.aptEnabled=false
--- a/java/cspy/.settings/org.eclipse.jdt.core.prefs
+++ b/java/cspy/.settings/org.eclipse.jdt.core.prefs
@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.processAnnotations=disabled
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=1.7
--- a/java/cspy/.settings/org.eclipse.m2e.core.prefs
+++ b/java/cspy/.settings/org.eclipse.m2e.core.prefs
@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
--- a/java/cspy/Makefile
+++ b/java/cspy/Makefile
@ -0,0 +1,15 @@
+.PHONY: clean pkg deps
+
+pkg:
+	mvn --quiet package
+	cp target/cspy-1.0-SNAPSHOT.jar ../../inst/java
+	cp deps/salvation-2.6.0.jar ../../inst/java
+
+deps:
+	mvn dependency:copy-dependencies -DoutputDirectory=deps
+
+clean:
+	mvn clean
+
+new:
+	mvn archetype:generate -DgroupId=is.rud.cspy -DartifactId=crsspy -DarchetypeArtifactId=maven-archetype-quickstart -DarchetypeVersion=1.4 -DinteractiveMode=false
--- a/java/crsspy/deps/hamcrest-core-1.3.jar
+++ b/java/crsspy/deps/hamcrest-core-1.3.jar
--- a/java/crsspy/deps/junit-4.11.jar
+++ b/java/crsspy/deps/junit-4.11.jar
--- a/java/crsspy/deps/salvation-2.6.0.jar
+++ b/java/crsspy/deps/salvation-2.6.0.jar
--- a/java/crsspy/pom.xml
+++ b/java/crsspy/pom.xml
@ -4,11 +4,11 @@
  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
  <modelVersion>4.0.0</modelVersion>

-  <groupId>is.rud.crsspy</groupId>
-  <artifactId>crsspy</artifactId>
+  <groupId>is.rud.cspy</groupId>
+  <artifactId>cspy</artifactId>
  <version>1.0-SNAPSHOT</version>

-  <name>crsspy</name>
+  <name>cspy</name>
  <!-- FIXME change it to the project's website -->
  <url>http://www.example.com</url>

--- a/java/crsspy/src/main/java/is/rud/crsspy/App.java
+++ b/java/crsspy/src/main/java/is/rud/crsspy/App.java
--- a/java/crsspy/src/test/java/is/rud/crsspy/AppTest.java
+++ b/java/crsspy/src/test/java/is/rud/crsspy/AppTest.java
--- a/java/cspy/target/classes/is/rud/cspy/App.class
+++ b/java/cspy/target/classes/is/rud/cspy/App.class
--- a/java/cspy/target/test-classes/is/rud/crsspy/AppTest.class
+++ b/java/cspy/target/test-classes/is/rud/crsspy/AppTest.class
--- a/tests/testthat/test-crsspy.R
+++ b/tests/testthat/test-crsspy.R
			`@ -1 +0,0 @@`
			`/Users/bob/packages/crsspy/java/crsspy/src/main/java/is/rud/crsspy/App.java`